tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9469 from open-sausages/pulls/4/fix-broken-merge

Browse Source 
DOC Fix broken merge request in change logs
This commit is contained in:
Serge Latyntsev 2020-04-15 12:56:48 +12:00 committed by GitHub
commit d253d87b74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/en/04_Changelogs/4.4.6.md
View File

@ -445,7 +445,6 @@ for more details.
<!--- Changes below this line will be automatically regenerated -->
<<<<<<< HEAD
## Change Log
### Bugfixes
@ -453,6 +452,4 @@ 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
<!--- Changes above this line will be automatically regenerated -->