]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c93e4c8 33cd60a)
Merge pull request #14862 from owncloud/introduce-shipped.json-master
authorMorris Jobke <hey@morrisjobke.de>
Mon, 23 Mar 2015 16:17:33 +0000 (17:17 +0100)
committerMorris Jobke <hey@morrisjobke.de>
Mon, 23 Mar 2015 16:17:33 +0000 (17:17 +0100)
shipped apps are now defined in core/shipped.json - the shipped tag in i...

1  2 
lib/private/app.php patch | diff1 | diff2 | blob | history

diff --cc lib/private/app.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server