tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-06-18 10:41:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge 3.1 into master

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Damian Mooyman 2016-05-11 17:54:40 +12:00
commit 639092d333
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -11,7 +11,6 @@
"silverstripe/asset-admin": "^1" "silverstripe/asset-admin": "^1"
}, },
"require-dev": { "require-dev": {
"ext-tidy": "*",
"phpunit/PHPUnit": "~4.8" "phpunit/PHPUnit": "~4.8"
}, },
"extra": { "extra": {