From: Alex Monk <krenair@gmail.com>
Date: Fri, 30 Jan 2015 21:44:09 +0000 (-0800)
Subject: Update karma to latest version
X-Git-Tag: 1.31.0-rc.0~12540
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=1ac1512db86d8d821f81c4d553da82a9e0ae7ad0;p=lhc%2Fweb%2Fwiklou.git

Update karma to latest version

Per Timo, hopefully this should fix our issues with Chromium timing out
after 10 seconds?

Related patch: https://github.com/karma-runner/karma/commit/840ee5f7

Change-Id: Idbac350e2c612290f860ae740ef6ba242c9e0896
---

diff --git a/package.json b/package.json
index 101fcd9bdb..6bbcf39903 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "grunt-jscs": "0.8.1",
     "grunt-jsonlint": "1.0.4",
     "grunt-karma": "0.9.0",
-    "karma": "0.12.28",
+    "karma": "0.12.31",
     "karma-chrome-launcher": "0.1.7",
     "karma-firefox-launcher": "0.1.3",
     "karma-qunit": "0.1.4",