cakephp2-php8/cake
mark_story 8cdee90b4f Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
..
config Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
console Merge branch '1.3-misc' into 1.3-merger 2009-11-22 21:28:14 -05:00
libs Merge branch '1.3-misc' into 1.3-merger 2009-11-22 21:28:14 -05:00
tests Merge branch '1.3-misc' into 1.3-merger 2009-11-22 21:28:14 -05:00
basics.php Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
bootstrap.php Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit. 2009-08-01 08:36:57 -04:00
dispatcher.php Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -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