mark_story 9c51f720ed Merge branch '1.3' into jshelper-integration ... Conflicts: cake/tests/cases/libs/view/helpers/js.test.php		2009-07-06 23:43:57 -04:00
..
config	fixing up versions numbers in 1.3	2009-05-01 11:17:53 -07:00
console	Merge branch '1.2' into 1.3	2009-07-02 09:27:00 -07:00
libs	Merge branch '1.3' into jshelper-integration	2009-07-06 23:43:57 -04:00
tests	Merge branch '1.3' into jshelper-integration	2009-07-06 23:43:57 -04:00
basics.php	fixes #6359, array_intersect_key compatibility with php4	2009-06-16 20:22:41 +00:00
bootstrap.php	merging 1.3-misc into master	2009-05-01 14:05:46 -07:00
dispatcher.php	some more updates to path handling	2009-06-10 16:13:39 -07:00
LICENSE.txt	closes #5271, removing root docs directory. adding README	2008-12-25 18:05:56 +00:00
VERSION.txt	merging 1.2	2009-05-04 15:57:10 -07:00