Merge branch 'patch_JHttp' of https://github.com/piotr-cz/joomla-cms … · joomla/joomla-cms@dafb29d · GitHub

Commit

Merge branch 'patch_JHttp' of https://github.com/piotr-cz/joomla-cms …

Browse files

…into patch_JHttp

Conflicts:
	libraries/joomla/http/factory.php

Loading branch information

piotr-cz committed Sep 6, 2014

2 parents 5f48a7e + a8f37b4 commit dafb29d