]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Thu, 23 May 2013 09:11:57 +0000 (11:11 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Thu, 23 May 2013 09:11:57 +0000 (11:11 +0200)
commitcb79169cf54bfc9d7c79422ebf118717acf9d980
tree0acfd20c51432c2a3125be39512fb2c808cbaff1
parent46c784ccdfd931fee00dd5fd760711027d0b2aec
parent698862519de6b364da6c20a97d8c546204e80f3d
Merge branch 'master' into files_encryption