]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Sat, 18 May 2013 08:33:44 +0000 (10:33 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Sat, 18 May 2013 08:33:44 +0000 (10:33 +0200)
commit173332afccbc763fefdb47d6664afb1e46e48b66
treefefecc1bc1b1e3700a345b32fe751e6e6be27a5c
parentf70240f4308d89183e00c9620b9703d30f905a99
parent41165afa598e828f86c07440350a5b2453dd5ddc
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption