cakephp2-php8/lib/Cake/Network
mark_story 3fc627c5f8 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
	lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
..
Email Merge branch 'master' into 2.4 2013-03-26 20:31:54 -04:00
Http Backwards compat for auth in the config array of HttpSocket::request() 2013-03-29 15:46:42 -07:00
CakeRequest.php Merge branch 'master' into 2.4 2013-02-24 20:24:26 -05:00
CakeResponse.php Fix typos 2013-03-05 00:05:14 -07:00
CakeSocket.php Fix typos 2013-03-05 00:05:14 -07:00