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/templates | |
| 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/templates')
| -rw-r--r-- | apps/files_trashbin/templates/part.list.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index 2de0d7ee91a..dea0a43cd4c 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -69,4 +69,3 @@ </td> </tr> <?php endforeach; -
\ No newline at end of file |