]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into file_encryption_external_storage_fixes
authorFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 17:19:40 +0000 (19:19 +0200)
committerFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 17:19:40 +0000 (19:19 +0200)
commit1202ab9995e2fa2293bfb8017fc58ca6daa4fba2
tree7e839e730867ffe42b1d6626c819e87c450cae7f
parentd2652645425777c1a97f8421e51aad9bdcf39684
parent8a5dec777553eab92c6ddf7a5a131b47761f1e28
Merge branch 'master' into file_encryption_external_storage_fixes
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/util.php