]> 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 16:51:11 +0000 (18:51 +0200)
committerFlorin Peter <github@florin-peter.de>
Mon, 22 Apr 2013 16:51:11 +0000 (18:51 +0200)
commit2827004634d5948204c6e1c9a4b7ebdc3b607850
treea7d9f71c0ccef827e92a7ba1742f4484723353e2
parent37c72059417d2f2f776ee4318e3705adf6c54fe7
parenta4364a93d0e80e0d1daa2b28713df05c25970fd1
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/util.php