aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Hand <joe@joeahand.com>2016-12-19 17:10:52 -0800
committerJoe Hand <joe@joeahand.com>2016-12-19 17:11:37 -0800
commit092d10c5b6d36b914f024fbbe0c167bc2c284726 (patch)
treed4ed78b7fd44c1ed3a3e9a2083addcd2f4760778
parentadb60ff86356115aa0050aea989bdd92fc9fbb45 (diff)
downloaddat-docs-092d10c5b6d36b914f024fbbe0c167bc2c284726.tar.gz
dat-docs-092d10c5b6d36b914f024fbbe0c167bc2c284726.zip
back to deploy on master
-rw-r--r--.travis.yml2
-rw-r--r--README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 70dbd85..9c03b91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ node_js:
branches:
only:
- - deploy
+ - master
before_script:
- git config --global user.email "robot@overlord.industries"
diff --git a/README.md b/README.md
index 9402a50..b7cff4c 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ This documentation uses [minidocs](https://github.com/freeman-lab/minidocs) for
### Deployment
-Deployment happens automatically via Travis when updates are pushed to the deploy branch.
+Deployment happens automatically via Travis when updates are pushed to the master branch.
### NPM Commands