Merge branch 'master' into production

This commit is contained in:
Nick Winter 2016-01-20 13:06:03 -08:00
commit 3249be3102

View file

@ -44,7 +44,7 @@
"validated-backbone-mediator": "~0.1.3", "validated-backbone-mediator": "~0.1.3",
"jquery.browser": "~0.0.6", "jquery.browser": "~0.0.6",
"zatanna": "https://github.com/differentmatt/zatanna.git#master", "zatanna": "https://github.com/differentmatt/zatanna.git#master",
"modernizr": "~2.8.3", "modernizr": "~3.3.1",
"backfire": "~0.3.0", "backfire": "~0.3.0",
"fastclick": "~1.0.3", "fastclick": "~1.0.3",
"three.js": "~0.71.0", "three.js": "~0.71.0",