]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into trashbin_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Wed, 20 Feb 2013 23:05:30 +0000 (00:05 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Wed, 20 Feb 2013 23:05:30 +0000 (00:05 +0100)
commit6aed7abfbe4a58cec822bdd16d8c71d4bac14c28
tree9dd60cd8ac13d2e5a0bd147a8c79a4a49d6416bf
parentfc1fba23040908fe5629f89b66a280aea5578520
parenteb3769e6d6e1b26d2c20c7b26c6a334a5d761f08
Merge branch 'master' into trashbin_encryption
apps/files_trashbin/index.php
apps/files_trashbin/templates/index.php