Merge branch 'master' into feature/prettier

lapanti · Aug 29, 2017 · 06ddb4a · 06ddb4a
2 parents 5e51c27 + d0d232f
commit 06ddb4a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ dist/
 !**/.vscode/tasks.json
 yarn-error.log
 _book/
+deploy_key
diff --git a/.travis.yml b/.travis.yml
@@ -9,11 +9,3 @@ script: yarn run test:ci
 after_script:
 - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
 - greenkeeper-lockfile-upload
-deploy:
-  provider: script
-  script: ./publish.sh
-  on:
-    branch: master
-before_install:
-- openssl aes-256-cbc -K $encrypted_5a1a1505749b_key -iv $encrypted_5a1a1505749b_iv
-  -in deploy_key.enc -out deploy_key -d
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "@types/nock": "^8.2.1",
     "@types/react": "^15.0.27",
     "@types/react-dom": "^15.5.0",
-    "@types/react-redux": "^4.4.42",
+    "@types/react-redux": "^5.0.5",
     "@types/react-router-dom": "^4.0.4",
     "@types/react-router-redux": "^5.0.2",
     "browserify": "^14.4.0",

diff --git a/publish.sh b/publish.sh