Merge branch 'master' into release

ryardley · Aug 24, 2016 · cde4b66 · cde4b66
2 parents dcb6aca + 2deda1e
commit cde4b66
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "docs": "doctoc README.md --title '##Contents'",
     "pretest-watch": "gulp compile",
     "report-coverage": "npm run build && nyc --require babel-core/register npm run test-once && nyc report --reporter=lcov > coverage.lcov && codecov",
+    "release": "git checkout master && git pull && git checkout release && git pull && git merge master && git push && git checkout master",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
     "test": "npm run build && npm run test-once",
     "test-and-compile": "npm run build && npm test",