cakephp2-php8/app
mark_story acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
..
config Removing duplicated section. 2009-11-13 10:26:57 -05:00
controllers/components Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
libs Adding app/libs dir. app/libs is for storing 1st party libraries that are not technically vendor files, as they do not originate from vendor sources. 2009-10-28 09:16:09 -04:00
locale/eng/LC_MESSAGES Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
models Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
plugins Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
tests Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
tmp Adding deleted empty file back in. 2009-11-15 20:07:02 -05:00
vendors/shells Removing unused folders from app/vendors 2007-10-18 16:51:16 +00:00
views Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
webroot Update license lines throughout. 2009-11-06 17:51:51 +11:00
.htaccess Merging fixes and enhancements into trunk 2006-02-18 23:42:21 +00:00
index.php Update license lines throughout. 2009-11-06 17:51:51 +11:00