Snippets Groups Projects

settings

Merge branch 'master' into update_shipped_apps_from_appstore

Georg Ehrke authored Jun 5, 2014

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

0fe8f77c

0fe8f77c Jun 5, 2014

Name	Last commit	Last update
..
admin
ajax
changepassword
css
img
js
l10n
templates
admin.php
apps.php
help.php
languageCodes.php
personal.php
routes.php
settings.php
users.php