Merge branch 'master' into production

This commit is contained in:
Nick Winter 2016-01-20 13:38:22 -08:00
commit d3ff3433ca

View file

@ -55,7 +55,7 @@
"aether": "~0.4.0", "aether": "~0.4.0",
"async": "0.2.x", "async": "0.2.x",
"aws-sdk": "~2.0.0", "aws-sdk": "~2.0.0",
"bayesian-battle": "https://github.com/codecombat/bayesian-battle/tarball/master", "bayesian-battle": "0.0.x",
"coffee-script": "1.9.x", "coffee-script": "1.9.x",
"connect": "2.7.x", "connect": "2.7.x",
"express": "~3.0.6", "express": "~3.0.6",