mark_story a3ae58da09 Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/View/View.php		2012-10-01 21:20:25 -04:00
..
Schema	Fix coding standards errors.	2012-07-26 21:22:50 -04:00
acl.ini.php	Updated copyright to 2012.	2012-03-12 22:46:07 -04:00
acl.php	Updated copyright to 2012.	2012-03-12 22:46:07 -04:00
bootstrap.php	Adding timeout and port options to the redis cache engine	2012-05-29 23:39:56 +01:00
core.php	Use file cache as the default cache engine.	2012-07-15 09:11:27 -04: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	Update text in routes.php to clarify when to remove core routes.	2012-09-30 20:17:50 -04:00