cakephp2-php8/lib/Cake/Network
mark_story 734bb9223b Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
2014-09-06 23:04:20 -04:00
..
Email Merge pull request #4011 from ndm2/stmp-auth-reponse-evaluation-fix 2014-07-24 08:42:22 -04:00
Http Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
CakeRequest.php Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
CakeResponse.php Fix reversed arguments in error message. 2014-08-08 23:29:29 -04:00
CakeSocket.php Merge pull request #3706 from MelvinRoss/httpsocketheader 2014-07-20 21:58:37 -04:00