mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-05 11:02:40 +00:00
Merge branch '2.0' into 2.1
Conflicts: lib/Cake/Config/config.php lib/Cake/Console/Command/Task/ModelTask.php lib/Cake/Console/Command/TestsuiteShell.php lib/Cake/Model/CakeSchema.php lib/Cake/Model/Datasource/Database/Sqlite.php lib/Cake/Test/Case/Model/ModelTestBase.php lib/Cake/Test/Case/Routing/DispatcherTest.php lib/Cake/Test/Case/Utility/FileTest.php lib/Cake/VERSION.txt
This commit is contained in:
commit
6d269ce25d
168 changed files with 1504 additions and 765 deletions
|
@ -69,6 +69,7 @@ abstract class BaseModelTest extends CakeTestCase {
|
|||
'core.uuiditems_uuidportfolio', 'core.uuiditems_uuidportfolio_numericid', 'core.fruit',
|
||||
'core.fruits_uuid_tag', 'core.uuid_tag', 'core.product_update_all', 'core.group_update_all',
|
||||
'core.player', 'core.guild', 'core.guilds_player', 'core.armor', 'core.armors_player',
|
||||
'core.bidding', 'core.bidding_message'
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue