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

Merge remote branch 'origin/develop' into develop-next 

Conflicts:
	WHATSNEW.md
	include/client/header.inc.php
parents dbc39b4f 91602a7e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment