Commit 0fe8f77c authored 10 years ago by Georg Ehrke

Merge branch 'master' into update_shipped_apps_from_appstore

Conflicts:
	lib/private/app.php
	settings/templates/apps.php

Branches

No related tags found

No related merge requests found

Showing with 90 additions and 88 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment