Merge https://github.com/RobinBuschmann/sequelize-typescript into fix-readme-links

ElisaBaum · ElisaBaum · commit 6306a544202e · 2017-07-04T20:14:59.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
 language: node_js
 
 node_js:
-  - "6.1"
+  - "7"
+
+before_install:
+  - npm i -g npm@5
 
 install:
   - npm install
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sequelize-typescript",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Decorators and some other extras for sequelize (v3 + v4)",
   "scripts": {
     "build": "tsc --project lib/models/v4 && tsc",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sequelize-typescript",`
`3`		`- "version": "0.3.4",`
	`3`	`+ "version": "0.3.5",`
`4`	`4`	`"description": "Decorators and some other extras for sequelize (v3 + v4)",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "tsc --project lib/models/v4 && tsc",`