Merge branch 'master' into develop

Rulox · Rulox · commit 6d2509d0e2a8 · 2017-01-24T23:45:07.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,5 @@ npm-debug.log
 .webpack.config.js.swp
 .eslintcache
 
-# Dest assets folders
-public/css
-public/js
-
 # Build folder
 dist/
diff --git a/.travis.yml b/.travis.yml
@@ -10,4 +10,4 @@ before_install:
   npm install
   npm --version
 script:
-  - npm run lint -s
+  - npm run lint
