Merge branch '2.2' into 2
This commit is contained in:
commit
4e6fbe17aa
|
@ -2,7 +2,9 @@
|
||||||
"name": "silverstripe/iframe",
|
"name": "silverstripe/iframe",
|
||||||
"description": "Add an iFrame pagetype to SilverStripe, to show content from another website",
|
"description": "Add an iFrame pagetype to SilverStripe, to show content from another website",
|
||||||
"type": "silverstripe-vendormodule",
|
"type": "silverstripe-vendormodule",
|
||||||
"keywords": ["silverstripe"],
|
"keywords": [
|
||||||
|
"silverstripe"
|
||||||
|
],
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
@ -27,11 +29,8 @@
|
||||||
"extra": {
|
"extra": {
|
||||||
"expose": [
|
"expose": [
|
||||||
"javascript"
|
"javascript"
|
||||||
],
|
]
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "2.x-dev"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true
|
"prefer-stable": true
|
||||||
}
|
}
|
Loading…
Reference in New Issue