mark_story d38857095a Merge branch '1.3' into 2.0 ... Conflicts: cake/libs/model/model.php cake/libs/validation.php cake/libs/view/helpers/ajax.php cake/tests/cases/libs/controller/components/session.test.php		2010-07-24 22:34:42 -04:00
..
libs	Merge branch '1.3' into 2.0	2010-07-24 22:34:42 -04:00
templates	Removing closing ?> on bake templates so they match the rest of CakePHP.	2010-07-01 18:19:37 -04:00
cake	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.bat	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.php	Fixing notices introduced in last commit	2010-07-07 23:03:24 -04:30
error.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00