merge master
Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
Please register or sign in to comment
Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php