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

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

Conflicts:
	bootstrap.php
	include/ajax.orgs.php
	include/class.dept.php
	include/class.file.php
	include/class.organization.php
	include/class.staff.php
	include/staff/profile.inc.php
parents a5d898b2 48e10195
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 114 additions and 41 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment