cakephp2-php8/app/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 Merge branch 'master' into 2.3 2012-11-10 21:33:26 -05:00
acl.ini.php Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
acl.php Remove trailing whitespace from comments 2012-10-15 18:19:37 -06:00
bootstrap.php Remove trailing whitespace from comments 2012-10-15 18:19:37 -06:00
core.php Remove trailing whitespace from comments 2012-10-15 18:19:37 -06:00
database.php.default Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
email.php.default Added "missing" comma after smtp log option. 2012-04-08 21:09:05 -04:00
routes.php Remove trailing whitespace from comments 2012-10-15 18:19:37 -06:00