]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into trashbin_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 25 Feb 2013 11:14:51 +0000 (12:14 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 25 Feb 2013 11:14:51 +0000 (12:14 +0100)
commit4dea6a6228390713c0296dd6a447b9f60a211767
treee5f7840770ab4ea67f0a58d6642b6b75cfa05fda
parent6aed7abfbe4a58cec822bdd16d8c71d4bac14c28
parent9ee5069f2a1d76c899eeef6cec0f06387764fabd
Merge branch 'master' into trashbin_encryption

Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php