mirror of
https://github.com/silverstripe/silverstripe-textextraction
synced 2024-09-30 13:19:06 +02:00
Merge branch '2.0' into 2.1
This commit is contained in:
commit
9f04583ed5
@ -29,9 +29,5 @@
|
|||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-fileinfo": "Improved support for file mime detection"
|
"ext-fileinfo": "Improved support for file mime detection"
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": []
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "2.1.x-dev"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user