Commit graph

2 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
4cebe55a9b Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	app/webroot/index.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/tests/cases/libs/controller/components/auth.test.php
2011-02-21 22:28:30 -04:30
José Lorenzo Rodríguez
1c0a4c9e0a Starting to move console classes 2010-12-07 00:47:53 -04:30
Renamed from cake/console/templates/skel/webroot/.htaccess (Browse further)