]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption_upgrade_fix
authorBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)
commitbc2862fcb947ac65c80b5d49ea8f2c2271eb8021
tree30938e61873554edd056de942189ac3851e9d488
parentfd5042cc460ec35112cc69928e441b5395142190
parent54f3174665262a5d1b1e1135667342b17b5d05b0
Merge branch 'master' into files_encryption_upgrade_fix
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/util.php