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
|
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
|
5fa028839e
|
Fixing paths location in cake.php files
|
2010-12-19 23:17:53 -04:30 |
|
José Lorenzo Rodríguez
|
1c0a4c9e0a
|
Starting to move console classes
|
2010-12-07 00:47:53 -04:30 |
|