Merge pull request #35 from blandine/bump-version

bump version to 1.1.3
Teleopti · Mar 7, 2016 · f9d8957 · f9d8957
2 parents 07666ca + 14d6058
commit f9d8957
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ install: npm install
 before_script: grunt dist --verbose
 script:
   - ./node_modules/.bin/karma start --single-run --browsers PhantomJS
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then bash ./deploy-ghpages.sh; fi
+  - if [ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]; then bash ./deploy-ghpages.sh; fi
 env:
   global:
     - GH_REF: github.com/Teleopti/styleguide.git

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "teleopti-styleguide",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "repository": {
     "type": "git",
     "url": "git://github.com/Teleopti/styleguide.git"