cakephp2-php8/lib/Cake/I18n
mark_story 27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
..
I18n.php Merge branch '2.3' into type-checks 2012-10-24 19:03:44 +01:00
L10n.php doc block correction 2012-09-28 14:51:51 +02:00
Multibyte.php Merge branch 'master' into 2.3 2012-11-20 23:02:33 -05:00