]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into decrypt_files_again
authorBjoern Schiessle <schiessle@owncloud.com>
Sat, 17 Aug 2013 11:15:22 +0000 (13:15 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Sat, 17 Aug 2013 11:15:22 +0000 (13:15 +0200)
commitcabe92ef1240e171a812f5822ac69b4d7742fd71
tree469e9089107d440da0c12c291abbd626d6d08b33
parent7adfc27cafa6f94962a33c158af9c45e71e012c5
parentd3e2f31adad5eeaf415154dd2fb88cb9fec0b3c1
Merge branch 'master' into decrypt_files_again

Conflicts:
apps/files_encryption/tests/keymanager.php
12 files changed:
apps/files/index.php
apps/files/js/files.js
apps/files/templates/index.php
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php
apps/files_encryption/tests/keymanager.php
apps/files_encryption/tests/share.php
apps/files_trashbin/lib/trash.php
lib/util.php
settings/templates/personal.php