Commit graph

4 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
79c6428e49 Fixing DbAcl tests 2010-12-22 00:05:46 -04:30
José Lorenzo Rodríguez
f540920b76 More App::imports converted 2010-12-09 01:25:24 -04:30
José Lorenzo Rodríguez
4a287faa1e Moving the tests folder 2010-12-08 01:36:38 -04:30
Renamed from cake/tests/cases/libs/model/db_acl.test.php (Browse further)