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

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

Conflicts:
	inc/plugin.php
parents 73411587 da957271
No related branches found
No related tags found
No related merge requests found
Showing
with 1014 additions and 843 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