Merge branch '4.0' into 4.1

This commit is contained in:
Aaron Carlino 2018-11-06 15:08:09 +13:00
commit c4bb60bc20

View File

@ -958,6 +958,9 @@ warnings:
'Object':
message: 'Replaced with traits'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#object-replace'
'SS_Object':
message: 'Replaced with traits'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#object-replace'
'SS_Log':
message: 'Replaced with a PSR-3 logger'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#psr3-logging'