Skip to content
Commit 0ce35af0 authored by Christopher Schäpers's avatar Christopher Schäpers
Browse files

Merge branch 'master' into improve_app-management 

Conflicts:
	settings/js/apps.js
parents 7c296a6c a89199cc
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