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

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

Conflicts:
	include/class.client.php
	include/class.usersession.php
parents 6f23bf7e 7d6a6990
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