cakephp2-php8/lib/Cake/Network
mark_story 4d6611b328 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
..
Email Consolidate with conditions sniff. 2014-12-09 03:17:35 +01:00
Http Merge branch 'master' into 2.6 2014-12-17 21:38:32 -05:00
CakeRequest.php Merge branch 'master' into 2.6 2014-12-17 21:38:32 -05:00
CakeResponse.php Merge branch 'master' into 2.6 2014-12-17 21:38:32 -05:00
CakeSocket.php Merge branch 'master' into 2.6 2014-11-07 15:13:46 -05:00