cakephp2-php8/lib/Cake/Console/Templates/skel/Config
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
..
Schema fix remaining cs errors 2012-11-04 13:56:13 +01:00
acl.ini.php Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
bootstrap.php Update skel directory logging configuration. 2012-10-13 02:29:25 -04:00
core.php cleanup 2012-10-27 00:26:54 +02:00
database.php.default Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
email.php.default Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
routes.php Update text in routes.php to clarify when to remove core routes. 2012-09-30 20:17:50 -04:00