José Lorenzo Rodríguez
|
4c0e06c451
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
|
2011-01-02 02:00:03 -04:30 |
|
mark_story
|
ef77e60cb0
|
Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
|
2010-12-24 14:09:57 -05:00 |
|
José Lorenzo Rodríguez
|
5fa028839e
|
Fixing paths location in cake.php files
|
2010-12-19 23:17:53 -04:30 |
|
mark_story
|
9ebd015739
|
Adding omitted return statements.
|
2010-10-17 22:43:06 -04:00 |
|
mark_story
|
c04307a2d6
|
Adding app/console with a link back to the distro cake directory.
Need to update project bake to update app/console + add to skel.
|
2010-10-16 14:03:44 -04:00 |
|