]> 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 22:45:29 +0000 (00:45 +0200)
committerFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 22:45:29 +0000 (00:45 +0200)
commit313631edf6aac23a68ab70bd3c0d6f0d6b59b894
tree16747f433c8ee6eee6e2f7d89b1eae4c749226bf
parent1337f48d64cd6ac99b28a0d6bfc20509ea9e6bff
parent2ce555fe55911ba5fe6c6bdbc6a306753b57ab6e
Merge branch 'master' into file_encryption_external_storage_fixes

Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/webdav.php