Merge branch '2.5' into 2

This commit is contained in:
Robbie Averill 2019-08-12 16:47:42 +12:00
commit 5c38b0abce

View File

@ -20,7 +20,6 @@
} }
], ],
"require": { "require": {
"php": "^7.1",
"silverstripe/framework": "~3.7", "silverstripe/framework": "~3.7",
"monolog/monolog": "~1.15" "monolog/monolog": "~1.15"
}, },