Merge branch '1.0'

* 1.0: [Behat] Minor typo fix Update contributing guide Partition changelog & upgrade files
ezecosystem · Sep 21, 2017 · e67240f · e67240f
2 parents 7b6c1d1 + 57d4d2b
commit e67240f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md → CHANGELOG-1.0.md b/CHANGELOG.md → CHANGELOG-1.0.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,4 +10,4 @@ in two separate parts of our [Contributing Guide](http://docs.sylius.org/en/late
 Security Issues
 ---------------
 
-Sylius is not stable yet, but has been already used in production and we treat security very seriously. You can read about security procedures [here](http://docs.sylius.org/en/latest/contributing/code/security.html).
+We treat security very seriously, you can read about security procedures [here](http://docs.sylius.org/en/latest/contributing/code/security.html).
diff --git a/UPGRADE.md → UPGRADE-1.0.md b/UPGRADE.md → UPGRADE-1.0.md
diff --git a/...hanging_dispalay_currency_of_cart.feature → ...changing_display_currency_of_cart.feature b/...hanging_dispalay_currency_of_cart.feature → ...changing_display_currency_of_cart.feature
@@ -7,7 +7,7 @@ Feature: Changing display currency of the cart
     Background:
         Given the store operates on a single channel in "United States"
         And that channel allows to shop using the "GBP" currency
-        When the exchange rate of "US Dollar" to "British Pound" is 2.0
+        And the exchange rate of "US Dollar" to "British Pound" is 2.0
         And default tax zone is "US"
         And the store has "Pigeon Mail" shipping method with "$5.00" fee
         And the store has "Pugs" tax rate of 10% for "Mugs" within the "US" zone