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

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

Conflicts:
	setup/inc/class.installer.php
parents d5ade79d d751f452
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