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

Merge branch 'develop' into develop-next 

Conflicts:
	include/class.forms.php
parents 934cde36 f9ac0329
No related branches found
No related tags found
No related merge requests 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