cakephp2-php8/cake/console/templates/skel/config
José Lorenzo Rodríguez c559b9c22d Merge remote branch 'origin/2.0' into 2.0
Conflicts:
	cake/console/templates/skel/config/database.php.default
	cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
..
schema Changing more php version strings. 2010-10-03 12:46:03 -04:00
acl.ini.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
bootstrap.php Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
core.php Adding more documentation to core.php. 2010-11-27 19:39:55 -05:00
database.php.default Merge remote branch 'origin/2.0' into 2.0 2010-12-05 20:51:37 -04:30
routes.php Changing more php version strings. 2010-10-03 12:46:03 -04:00