]> 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>
Mon, 22 Apr 2013 09:59:26 +0000 (11:59 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 22 Apr 2013 09:59:26 +0000 (11:59 +0200)
commit8790ceba25ab3a7ae3359037981c0019e229160a
tree552949601e1970437a99eeb4a24057ec675e6da3
parenta2ba3c8a43780eab5ad8a4d96db33c584e7ae2ec
parent6b47da10bea66d7a925de2850919b503201558be
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption