Merge pull request #318 from buttercup/fix-state-restoration

Failsafe state restoration
buttercup · Jul 19, 2017 · 1e46124 · 1e46124
2 parents 98c8b7d + b86425f
commit 1e46124
Show file tree

Hide file tree

Showing 8 changed files with 277 additions and 9,277 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,20 @@
 language: node_js
 
 node_js:
-  - 7
+  - 8
 
-script: ./script/travis.sh
+env:
+  - CXX=g++-4.8
 
-before_install:
-  - rm yarn.lock
+script: ./script/travis.sh
 
 branches:
   only:
   - master
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "buttercup",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "productName": "Buttercup",
   "main": "./dist/app.js",
   "description": "Free and Open Source password vault",

diff --git a/appveyor.yml b/appveyor.yml
@@ -12,7 +12,7 @@ branches:
 skip_tags: true
 
 environment:
-  nodejs_version: "7"
+  nodejs_version: "8"
 
 cache:
   - node_modules -> package.json