Skip to content
Commit bc43dd70 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fixing-1424-master 

Conflicts:
	settings/js/users.js
parents 14e3d77d 68fa0b7d
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