cakephp2-php8/lib/Cake/I18n
mark_story e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -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-10 21:33:26 -05:00