]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84e6b8d 89cb7b5)
Merge pull request #732 from nextcloud/fix-shipped.json
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Fri, 5 Aug 2016 13:11:28 +0000 (15:11 +0200)
committerGitHub <noreply@github.com>
Fri, 5 Aug 2016 13:11:28 +0000 (15:11 +0200)
Order alphabetically and deduplicate the shipped.json


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