mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-06-15 09:11:40 +02:00
Merge 3.1 into master
# Conflicts: # composer.json
This commit is contained in:
commit
639092d333
|
@ -11,7 +11,6 @@
|
|||
"silverstripe/asset-admin": "^1"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-tidy": "*",
|
||||
"phpunit/PHPUnit": "~4.8"
|
||||
},
|
||||
"extra": {
|
||||
|
|
Loading…
Reference in New Issue
Block a user