Skip to content
Commit 66cab77b authored by Frank Karlitschek's avatar Frank Karlitschek
Browse files

merge master 

Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
parents 389c4e84 5761bd77
Hide whitespace changes
Inline Side-by-side
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