cakephp2-php8/cake
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
..
config Updating version numbers to 1.3.2 2010-06-07 02:21:51 +10:00
console Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
libs Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
tests Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
basics.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
bootstrap.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
dispatcher.php Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers to 1.3.2 2010-06-07 02:21:51 +10:00