Skip to content

Commit

Permalink
Merge pull request #867 from magento-south/MAGETWO-65075
Browse files Browse the repository at this point in the history
[SOUTH] MAGETWO-65075: Bump composer json version in private 2.1 branche to 2…
  • Loading branch information
slavvka authored Feb 24, 2017
2 parents 329ede8 + 4921d8b commit 54c2a0e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ env:
- TEST_SUITE=integration INTEGRATION_INDEX=1
- TEST_SUITE=integration INTEGRATION_INDEX=2
- TEST_SUITE=integration INTEGRATION_INDEX=3
- TEST_SUITE=static
cache:
apt: true
directories: $HOME/.composer/cache
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/magento2ce",
"description": "Magento 2 (Community Edition)",
"type": "project",
"version": "2.1.5",
"version": "2.1.6",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

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

0 comments on commit 54c2a0e

Please sign in to comment.