adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
cakephp2-php8/app
History
predominant 6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0 
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
..
config Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
controllers/components Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
libs Adding app/libs dir. app/libs is for storing 1st party libraries that are not technically vendor files, as they do not originate from vendor sources. 2009-10-28 09:16:09 -04:00
locale/eng/LC_MESSAGES Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
models Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
plugins Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
tests Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
tmp Re-adding file delete by error 2010-02-27 23:38:46 -04:30
vendors/shells Removing unused folders from app/vendors 2007-10-18 16:51:16 +00:00
views Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
webroot Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
.htaccess Merging fixes and enhancements into trunk 2006-02-18 23:42:21 +00:00
index.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00