Skip to content
Snippets Groups Projects
Commit b66e5840 authored by Gerrit Uitslag's avatar Gerrit Uitslag
Browse files

Merge remote-tracking branch 'origin/master' into trailingcolons

Conflicts:
	lib/plugins/usermanager/lang/nl/intro.txt
parents c8d7c938 54b26fbe
No related branches found
No related tags found
No related merge requests found
Showing
with 1518 additions and 818 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment