cakephp2-php8/cake
mark_story 7259a1b920 Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/text.php
	cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
..
config Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
console Merge branch '1.2' into 1.2-merger 2009-12-06 21:43:53 -05:00
libs Merge branch '1.2' into 1.2-merger 2009-12-06 21:43:53 -05:00
tests Merge branch '1.2' into 1.2-merger 2009-12-06 21:43:53 -05:00
basics.php Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
bootstrap.php Changing import of Dispatcher to direct require. 2009-11-07 17:53:14 -05:00
dispatcher.php Correcting constructor of MediaView to fix issues with viewVars not being set. 2009-12-01 09:50:27 -05:00
LICENSE.txt Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
VERSION.txt Updating version numbers for 1.3.0-alpha 2009-11-03 19:52:03 -05:00