]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'files_encryption'
authorSam Tuke <samtuke@owncloud.com>
Wed, 23 Jan 2013 12:54:09 +0000 (12:54 +0000)
committerSam Tuke <samtuke@owncloud.com>
Wed, 23 Jan 2013 12:54:09 +0000 (12:54 +0000)
commitcd832935e8b92a2461dedbd9eed92d2cd3337d92
tree3dafaceea80c13f0a083936edf8ac7c00b14c451
parent14d0903a287cd534cb778e0411c1883dcc63a22b
parentd95fc4e1e33f2e6fe4664d03bd39aa48f27e0ad8
Merge branch 'files_encryption'