Skip to content

Commit

Permalink
Merge pull request #8675 from pamil/treat-dev-master-as-1.1
Browse files Browse the repository at this point in the history 
Treat `dev-master` as 1.1
  • Loading branch information
@pjedrzejewski
pjedrzejewski committed Sep 15, 2017
2 parents 609cb80 + 819ed30 commit a04bfe8
Show file tree
Hide file tree
Showing 51 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"file": "app/config/parameters.yml"
},
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AddressingBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminApiBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AttributeBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ChannelBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CoreBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CurrencyBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CustomerBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/FixturesBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/GridBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/InventoryBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/LocaleBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MailerBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MoneyBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/OrderBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PaymentBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PayumBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ProductBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PromotionBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ResourceBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ReviewBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ShippingBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ShopBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/TaxationBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "test/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/TaxonomyBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "Tests/Functional/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ThemeBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/UiBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/UserBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
},
"incenteev-parameters": {
"file": "Tests/Functional/app/config/parameters.yml"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Addressing/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Attribute/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Channel/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Core/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Currency/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Customer/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Grid/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Inventory/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Locale/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Mailer/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Order/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Payment/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Product/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Promotion/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
}
}

0 comments on commit a04bfe8

Please sign in to comment.