]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into file_encryption_util_is_error
authorFlorin Peter <github@florin-peter.de>
Mon, 27 May 2013 12:41:53 +0000 (14:41 +0200)
committerFlorin Peter <github@florin-peter.de>
Mon, 27 May 2013 12:41:53 +0000 (14:41 +0200)
commit80433fc4c4b052d788d9a942ce9d332b0f526362
treeb12d522f99cdec249af1fb3bd4b00d7bd14a9c87
parent89f0c8f39d99b4c2bf0fb9dac1ad11cbe0781a3b
parent5e243b48bb51e94daa3ba32c9175945d579040c8
Merge branch 'master' into file_encryption_util_is_error

Conflicts:
apps/files_encryption/lib/util.php
apps/files_encryption/lib/util.php