diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 12:14:51 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 12:14:51 +0100 |
| commit | 4dea6a6228390713c0296dd6a447b9f60a211767 (patch) | |
| tree | e5f7840770ab4ea67f0a58d6642b6b75cfa05fda /apps/files_trashbin/appinfo | |
| parent | 6aed7abfbe4a58cec822bdd16d8c71d4bac14c28 (diff) | |
| parent | 9ee5069f2a1d76c899eeef6cec0f06387764fabd (diff) | |
| download | nextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.tar.gz nextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.zip | |
Merge branch 'master' into trashbin_encryption
Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
Diffstat (limited to 'apps/files_trashbin/appinfo')
| -rw-r--r-- | apps/files_trashbin/appinfo/app.php | 6 | ||||
| -rw-r--r-- | apps/files_trashbin/appinfo/info.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index b1a15cd13d1..7c04e583db1 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -1,7 +1,7 @@ <?php -OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php'; +OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php'; + -
OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook"); diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index e4217339602..7f807da579e 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <info> <id>files_trashbin</id> - <name>Trash bin</name> + <name>Deleted files</name> <description>Keep a copy of deleted files so that they can be restored if needed</description> <licence>AGPL</licence> <author>Bjoern Schiessle</author> |