]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption
authorSam Tuke <samtuke@owncloud.com>
Tue, 22 Jan 2013 17:31:05 +0000 (17:31 +0000)
committerSam Tuke <samtuke@owncloud.com>
Tue, 22 Jan 2013 17:31:05 +0000 (17:31 +0000)
commitaa648fca75539448c1437092108e21d6a3dc542e
treefed53fd5a704ec7433d82dfb08e8d56d471ca4b3
parentca454f0228a9d915ac56ac41f65ee865a7141ddc
parentdd40b691eee34d313a5894afbc7ccf217968fd94
Merge branch 'master' into files_encryption

Conflicts:
apps/files_encryption/templates/settings.php
lib/filecache.php
lib/filesystemview.php