cakephp2-php8/cake
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
..
config Merge branch '1.3' into merger 2010-11-16 21:48:13 -05:00
console Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-05 23:43:58 -04:30
libs Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-05 23:43:58 -04:30
tests Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-12-05 17:57:44 -08:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers for 1.3.6 2010-11-13 20:01:20 -05:00