Merge branch 'master' into keyofAndConstraints

ahejlsberg · ahejlsberg · commit 48f2b78125e8 · 2016-11-03T11:21:13.000-07:00
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
         "travis-fold": "latest",
         "ts-node": "latest",
         "tsd": "latest",
-        "tslint": "next",
+        "tslint": "4.0.0-dev.0",
         "typescript": "next"
     },
     "scripts": {
