Merge branch 'master' into update_shipped_apps_from_appstore (0fe8f77c) · Commits · github / nextcloud / server

Commit 0fe8f77c authored Jun 05, 2014 by

Georg Ehrke

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

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