]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d324db afdad5c)
Merge branch 'master' into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Tue, 21 May 2013 13:30:19 +0000 (15:30 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Tue, 21 May 2013 13:30:19 +0000 (15:30 +0200)
Conflicts:
apps/files_trashbin/l10n/nn_NO.php


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