Merge branch 'master' into refactor-model-junction

Conflicts: package.json
peerigon · Nov 15, 2013 · 3e97a2a · 3e97a2a
2 parents 3a8b6d8 + f003d0a
commit 3e97a2a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -51,7 +51,6 @@
         "rewire-webpack": "0.x",
         "supertest" : "0.x",
         "webpack-dev-server": "0.x",
-        "alamid-signal" : "0.x",
         "grunt-simple-mocha" : "git://github.com/yaymukund/grunt-simple-mocha.git"
     },
     "scripts" : {