mark_story 2afb05b590 Merge branch '2.0' into 2.1 ... Conflicts: app/View/Pages/home.ctp lib/Cake/Config/config.php lib/Cake/Core/App.php lib/Cake/VERSION.txt lib/Cake/View/Helper/NumberHelper.php		2012-02-12 10:06:13 -05:00
..
Schema	Add back missing .sql files, related to pull request 132 on docs repo	2011-11-17 13:00:54 +01:00
acl.ini.php	Incresing sync between app and skel directories.	2011-10-14 15:06:36 -04:00
bootstrap.php	fixed typo	2012-02-01 20:14:56 +01:00
core.php	Merge branch '2.0' into 2.1	2012-02-12 10:06:13 -05:00
database.php.default	Replacing 'driver' with 'datasource'.	2011-11-04 23:07:31 +01:00
email.php.default	Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating	2011-10-16 15:43:10 -04:30
routes.php	Incresing sync between app and skel directories.	2011-10-14 15:06:36 -04:00