TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add the merge plugin 

@daftspunk I readded the merge plugin accidentally removed in: db82bfa815
This commit is contained in:
Luke Towers 2017-06-06 09:28:50 -06:00 committed by GitHub
parent edcd899a79
commit 613ebf090d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -31,7 +31,8 @@
"october/system": "dev-l55upgrade",
"october/backend": "dev-l55upgrade",
"october/cms": "dev-l55upgrade",
"laravel/framework": "5.5.*@dev"
"laravel/framework": "5.5.*@dev",
"wikimedia/composer-merge-plugin": "dev-master"
},
"require-dev": {
"fzaninotto/faker": "~1.4",