Commit graph

53 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
22581516db Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/tests/cases/libs/controller/component.test.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
	lib/Cake/tests/cases/libs/controller/pages_controller.test.php
2010-12-18 00:04:44 -04:30
José Lorenzo Rodríguez
387281e506 Moving newly created classes to the new folders 2010-12-15 01:32:37 -04:30
Renamed from cake/libs/controller/components/paginator.php (Browse further)