cakephp2-php8/lib/Cake/tests/test_app/views/layouts
José Lorenzo Rodríguez d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
..
email Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
js Moving the tests folder 2010-12-08 01:36:38 -04:30
json Moving recently created files into the new folders 2010-12-18 21:52:03 -04:30
rss Moving the tests folder 2010-12-08 01:36:38 -04:30
xml Moving the tests folder 2010-12-08 01:36:38 -04:30
ajax.ctp Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
ajax2.ctp Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
cache_empty_sections.ctp Moving the tests folder 2010-12-08 01:36:38 -04:30
cache_layout.ctp Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
default.ctp Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
flash.ctp Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
multi_cache.ctp Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30