Skip to content

Commit

Permalink
Merge branch 'master' into feature/ps-6554/dev-unique-url-for-easy-sh…
Browse files Browse the repository at this point in the history 
…aring

# Conflicts:
#	Bundles/CartPage/src/SprykerShop/Yves/CartPage/Theme/default/components/molecules/cart-summary/cart-summary.twig
#	Bundles/CartPage/src/SprykerShop/Yves/CartPage/Theme/default/views/cart/cart.twig
#	Bundles/DiscountWidget/src/SprykerShop/Yves/DiscountWidget/Theme/default/components/molecules/cart-discount-summary/cart-discount-summary.twig
#	Bundles/DiscountWidget/src/SprykerShop/Yves/DiscountWidget/Theme/default/views/cart-discount-summary/cart-discount-summary.twig
#	Bundles/ShopUi/src/SprykerShop/Yves/ShopUi/Theme/default/components/molecules/product-card/product-card.twig
  • Loading branch information
Vitaliy Kirichenko committed May 21, 2019
2 parents 26d0b4e + 944501d commit 2f3690e
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: php
dist: trusty

php:
- 5.6
Expand Down

0 comments on commit 2f3690e

Please sign in to comment.