Commit graph

3 commits

Author SHA1 Message Date
AD7six
28eae99ecb translation changes in the view folder 2011-03-12 20:02:56 +01:00
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
c542ac20c9 Moving core view to the new folder and allowing the view class to find those views 2010-12-05 13:07:01 -04:30
Renamed from cake/libs/view/errors/error400.ctp (Browse further)