]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f1005f 2daec35)
Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_en...
authorBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 08:49:23 +0000 (10:49 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 08:49:23 +0000 (10:49 +0200)

Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server