Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-09-26 03:06:39 -07:00
commit 24cb15d56b

View file

@ -37,7 +37,7 @@
"firebase": "~1.0.2",
"catiline": "~2.9.3",
"d3": "~3.4.4",
"jsondiffpatch": "~0.1.5",
"jsondiffpatch": "0.1.8",
"nanoscroller": "~0.8.0",
"treema": "https://github.com/codecombat/treema.git#master",
"jquery.tablesorter": "~2",