cakephp2-php8/lib/Cake/Test/Case/Network
Jose Lorenzo Rodriguez 343d3279b9 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
..
Email Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
Http Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
CakeRequestTest.php Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
CakeResponseTest.php Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
CakeSocketTest.php cs 2014-04-02 02:23:43 +02:00