cakephp2-php8/cake
mark_story f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
..
config Changing more php version strings. 2010-10-03 12:46:03 -04:00
console Merge branch '1.3' into integration 2010-10-13 22:30:40 -04:00
libs Merge branch '1.3' into integration 2010-10-13 22:30:40 -04:00
tests Merge branch '1.3' into integration 2010-10-13 22:30:40 -04:00
basics.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
bootstrap.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
dispatcher.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updated version number to 1.3.4 2010-09-12 17:57:55 +10:00