Skip to content
Snippets Groups Projects
Commit 75a510d0 authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge remote branch 'kevin/issue/misc-fixes' into develop-next 

Conflicts:
	include/class.format.php
parents b9f736aa 6ddfd8b7
No related branches found
No related tags found
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