Commit graph

5 commits

Author SHA1 Message Date
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
José Lorenzo Rodríguez
43401c271a Fixing App::uses usage un CakeRouteTest 2010-12-21 21:46:12 -04:30
José Lorenzo Rodríguez
2907765404 Replacing almost all remaining uses of App::import 2010-12-10 01:53:27 -04:30
José Lorenzo Rodríguez
f84351dd07 More replacements of App::import to App::uses 2010-12-09 00:43:11 -04:30
José Lorenzo Rodríguez
4a287faa1e Moving the tests folder 2010-12-08 01:36:38 -04:30