Merge branch '2.0' into 2.1

This commit is contained in:
Robbie Averill 2017-12-20 16:41:27 +13:00
commit 9f04583ed5

View File

@ -29,9 +29,5 @@
"suggest": {
"ext-fileinfo": "Improved support for file mime detection"
},
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
}
"extra": []
}