Commit graph

4 commits

Author SHA1 Message Date
AD7six
38180e8951 translation changes in the model dir 2011-03-12 20:01:12 +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
3f64844de9 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/basics.php
2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
2fed702c57 Moving more model classes to the new package 2010-12-05 15:00:02 -04:30
Renamed from cake/libs/model/datasources/dbo/dbo_oracle.php (Browse further)