Skip to content

Commit

Permalink
Merge branch 'release-1.16.0' into spencer-update-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
spencern committed Aug 31, 2018
2 parents 51fae0e + adb0d19 commit 028f1e0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ workflows:
- docker-push
filters:
branches:
only: /^release-1\.15\.\d+$/
only: /^release-1\.16\.\d+$/
- deploy-docs:
requires:
- test-unit
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "reaction",
"description": "Reaction is a modern reactive, real-time event driven ecommerce platform.",
"version": "1.15.0",
"version": "1.16.0",
"main": "main.js",
"directories": {
"test": "tests"
Expand Down

0 comments on commit 028f1e0

Please sign in to comment.