Merge branch 'master' into production

This commit is contained in:
Nick Winter 2015-12-06 10:14:58 -08:00
commit b1bf840d9e

View file

@ -62,7 +62,7 @@
"express-useragent": "~0.0.9",
"geoip-lite": "^1.1.6",
"graceful-fs": "~2.0.1",
"gridfs-stream": "0.4.x",
"gridfs-stream": "~1.1.1",
"jsondiffpatch": "0.1.17",
"lodash": "~2.4.1",
"mailchimp-api": "2.0.x",