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

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

Conflicts:
	inc/media.php
	inc/plugin.php
	inc/template.php
	lib/plugins/authplain/_test/escaping.test.php
	lib/plugins/syntax.php
parents 1cc82e5c 9a0ca2cf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 460 additions and 101 deletions
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