cakephp2-php8/cake
Mark Story 4861da66ed Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
..
config Updating version numbers to 1.3.0-RC2 2010-03-14 16:44:54 -04:00
console Fixing the ability to use regular expressions for validation rules. Fixes #453 2010-03-13 19:44:20 -05:00
libs Merge remote branch 'origin/1.2' into 1.2-merger 2010-03-15 23:26:24 -04:00
tests Merge remote branch 'origin/1.2' into 1.2-merger 2010-03-15 23:26:24 -04:00
basics.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
bootstrap.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
dispatcher.php Fixing typo in dispatcher. Fixes #420 2010-03-04 22:04:50 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers to 1.3.0-RC2 2010-03-14 16:44:54 -04:00