mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
f21161ef46
differences upon merging. Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/libs/cache/file.php cake/libs/cake_session.php cake/libs/controller/components/email.php cake/libs/i18n.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/model/model_write.test.php |
||
---|---|---|
.. | ||
behaviors | ||
datasources | ||
app_model.php | ||
behavior_collection.php | ||
cake_schema.php | ||
connection_manager.php | ||
db_acl.php | ||
model.php | ||
model_behavior.php |