]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption
authorSam Tuke <samtuke@owncloud.com>
Tue, 22 Jan 2013 16:50:20 +0000 (16:50 +0000)
committerSam Tuke <samtuke@owncloud.com>
Tue, 22 Jan 2013 16:50:20 +0000 (16:50 +0000)
commit619780a67de6d4e1592e4c6e08e0689b022ec5c0
treed18fa54a628b26540eaa0acb4313868d3d28e8cb
parent3fbf362ba2f60917023833800e9e2dc47e190af1
parentcd802ed45bca8fabb0252e40ab14fa8bb0f935ec
Merge branch 'master' into files_encryption