diff --git a/docs/en/04_Changelogs/4.4.6.md b/docs/en/04_Changelogs/4.4.6.md index bae0b6f8b..a64dec674 100644 --- a/docs/en/04_Changelogs/4.4.6.md +++ b/docs/en/04_Changelogs/4.4.6.md @@ -445,6 +445,7 @@ for more details. +<<<<<<< HEAD ## Change Log ### Bugfixes @@ -452,4 +453,6 @@ for more details. * 2020-03-09 [6779fd3](https://github.com/silverstripe/silverstripe-assets/commit/6779fd3c8c1c05a3db5035bf6e541c9483d161fc) Add FolderMigrationHelper * 2020-03-08 [b269d8749](https://github.com/silverstripe/silverstripe-framework/commit/b269d874909cd70bb60c1a2974ea5446b43b0436) Register new sub tasks to fix files affected by CVE-2020-9280 and CVE-2019-12245 (Serge Latyntcev) * 2020-03-04 [12ea7cd](https://github.com/silverstripe/silverstripe-assets/commit/12ea7cd2037bebcb3196dd5e3aaa72e6dbc7c7b2) Create NormaliseAccessMigrationHelper to fix files affected by CVE-2019-12245 (Maxime Rainville) +======= +>>>>>>> 4.5.3 diff --git a/docs/en/04_Changelogs/4.5.2.md b/docs/en/04_Changelogs/4.5.2.md index 70c25557a..47b451498 100644 --- a/docs/en/04_Changelogs/4.5.2.md +++ b/docs/en/04_Changelogs/4.5.2.md @@ -445,4 +445,11 @@ for more details. +## Change Log + +### Bugfixes + + * 2020-03-09 [c4709b6](https://github.com/silverstripe/silverstripe-assets/commit/c4709b6c6af840ea618b36d8ffe76f1ed48a21b3) Add FolderMigrationHelper + * 2020-03-08 [9779e4296](https://github.com/silverstripe/silverstripe-framework/commit/9779e42963031a0fed2ed01fc3b8e470d1114723) Register new sub tasks to fix files affected by CVE-2020-9280 and CVE-2019-12245 (Serge Latyntcev) + * 2020-03-04 [89e69ad](https://github.com/silverstripe/silverstripe-assets/commit/89e69ad3b06072dc841d081c36063475e39df4f9) Create NormaliseAccessMigrationHelper to fix files affected by CVE-2019-12245 (Maxime Rainville) diff --git a/src/Dev/Tasks/MigrateFileTask.php b/src/Dev/Tasks/MigrateFileTask.php index 971c2c816..fffa76226 100644 --- a/src/Dev/Tasks/MigrateFileTask.php +++ b/src/Dev/Tasks/MigrateFileTask.php @@ -253,8 +253,6 @@ class MigrateFileTask extends BuildTask } } - $this->logger->info("Done!"); - $this->extend('postFileMigration'); $this->logger->info("Done!");