Skip to content
Snippets Groups Projects
Commit 18e9350c authored by Jared Hancock's avatar Jared Hancock
Browse files

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

Merge more upstream 1.7.3+ changes

Conflicts:
	main.inc.php
parents 7dd683f6 5ee6d3d6
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