cakephp2-php8/cake/console/templates/skel/config
Mark Story 09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
..
schema Moving skel/config/sql to skel/config/schema 2010-01-13 00:17:15 -05:00
acl.ini.php Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
bootstrap.php Update license lines throughout. 2009-11-06 17:51:51 +11:00
core.php Changing default Security.level to medium. 2009-12-13 11:59:14 +11:00
database.php.default Update license lines throughout. 2009-11-06 17:51:51 +11:00
inflections.php Merge remote branch 'origin/1.2' into merger 2010-01-15 11:51:58 -05:00
routes.php Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00