Merge branch 'hotfix/1.0.2'

diff --git a/.travis.yml b/.travis.yml
index d6ecb50d85aa742ab3a5595ed94076d8eebc7a45..904d0678baa0ad229b3f512e6c09d1c4fe3f1b06 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,3 @@ node_js:
 
 script:
   - npm run lint
-  - npm run build

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b90a0ad7ae0172191b0e095453c7b35bd3205cac..db1f6196d722972cd1b7c947638a1f5ee1c6aace 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.2] - 2017-08-30
+### Changed
+- Fix CI
+
 ## [1.0.1] - 2017-08-28
 ### Changed
 - Fix executable
@@ -20,3 +24,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 [Unreleased]: https://github.com/rbdr/sorting-hat/compare/master...develop
 [1.0.1]: https://github.com/rbdr/sorting-hat/compare/1.0.0...1.0.1
+[1.0.2]: https://github.com/rbdr/sorting-hat/compare/1.0.1...1.0.2

diff --git a/package.json b/package.json
index df3bd2819cc9ace2a57d83c307ae5024e235f4cd..2390f8bdc20fde85a1ce836777fe44fec5a2787d 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sorting-hat",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A mindwave powered sorting hat",
   "scripts": {
     "document": "jsdoc2md -f 'lib/**/*.js' > doc/README.md",