Rebase and fix merge conflict

kriasoft · Jun 10, 2016 · 5f1c95d · 5f1c95d
2 parents 47247fb + de4d26e
commit 5f1c95d
Show file tree

Hide file tree

Showing 136 changed files with 3,898 additions and 2,072 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.csscomb.json b/.csscomb.json
diff --git a/.csslintrc b/.csslintrc
diff --git a/.eslintrc b/.eslintrc
diff --git a/.gitattributes b/.gitattributes
@@ -13,6 +13,7 @@
 *.js    text eol=lf
 *.json  text eol=lf
 *.less  text eol=lf
+*.scss  text eol=lf
 *.md    text eol=lf
 *.sh    text eol=lf
 *.txt   text eol=lf

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 # Read about how to use .gitignore: https://help.github.com/articles/ignoring-files
 
 build
+database.sqlite
 node_modules
 ncp-debug.log
 npm-debug.log
diff --git a/.jscsrc b/.jscsrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,15 @@
-sudo: false
 language: node_js
 node_js:
-  - '4.1'
+  - '6'
+  - '5'
+env:
+  - CXX=g++-4.8
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+script:
+  - npm run lint
+  - npm run test