]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
authorFlorin Peter <github@florin-peter.de>
Mon, 22 Apr 2013 10:32:35 +0000 (12:32 +0200)
committerFlorin Peter <github@florin-peter.de>
Mon, 22 Apr 2013 10:32:35 +0000 (12:32 +0200)
commiteade87dc7945353f9d0ea0d9f95d68a44c524496
tree5915263e720e7747ca8614c79f17d868c30356ef
parentf6ac34afea6c1f68f53e0e7a076b0b274559fd8b
parent8a46e809f00745f4b67d118e85ec2d35e74b732e
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
apps/files_encryption/lib/util.php