cakephp2-php8/cake/console/templates/skel/config
mark_story 929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
..
schema Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
acl.ini.php Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
bootstrap.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
core.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
database.php.default Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
routes.php Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00