]> 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>
Tue, 23 Apr 2013 17:09:01 +0000 (19:09 +0200)
committerFlorin Peter <github@florin-peter.de>
Tue, 23 Apr 2013 17:09:01 +0000 (19:09 +0200)
commitf8819f54c2280f492d2e9cd4d7b0f227168d6d99
tree29bd5991011b11b0a9f59d1b10b3472b2bf8ddc9
parentbaa6fd639fb9e6b2a954975603428603fcd04a85
parentb7d8da87d0b094c5e55a0ac43995074fa3351618
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
apps/files_encryption/lib/proxy.php