mark_story 2020675078 Merge branch '1.3' into 2.0 ... Conflicts: cake/dispatcher.php cake/tests/cases/libs/controller/components/request_handler.test.php		2010-06-30 22:47:27 -04:00
..
config	Merge branch '1.3' into 2.0	2010-06-30 22:47:27 -04:00
controllers	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
libs	Adding libs to templates/skel so baked projects contain an app/libs dir.	2009-11-17 10:27:09 -05:00
locale/eng/LC_MESSAGES	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
models	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
plugins	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
tests	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
tmp	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
vendors/shells/tasks	Removing vendors/img, vendors/css and vendors/js from skel dirs.	2009-11-25 22:51:33 -05:00
views	Change Cake Console files to new use of shortcut for translations.	2010-04-16 01:43:39 +10:00
webroot	Merge branch '1.3' into 2.0	2010-06-26 12:29:20 -04:00
.htaccess	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
app_controller.php	Numerous 'shoer description' documentation entries updated to contain useful comments.	2010-05-30 01:20:28 +10:00
app_helper.php	Numerous 'shoer description' documentation entries updated to contain useful comments.	2010-05-30 01:20:28 +10:00
app_model.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
index.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00