Skip to content
Snippets Groups Projects
Commit c8636ca4 authored by Georg Ehrke's avatar Georg Ehrke
Browse files

Merge branch 'master' into update_shipped_apps_from_appstore 

Conflicts:
	lib/private/app.php
	lib/private/installer.php
parents 2bcfd8e0 cff9440a
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2824 additions and 2129 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment