Merge branch 'master' into production

This commit is contained in:
Nick Winter 2016-07-15 08:15:57 -07:00
commit fee1a6f98b

View file

@ -75,7 +75,7 @@
"mailchimp-api": "2.0.x",
"moment": "~2.5.0",
"mongodb": "^2.0.28",
"mongoose": "^4.2.9",
"mongoose": "4.5.3",
"mongoose-cache": "https://github.com/nwinter/mongoose-cache/tarball/master",
"node-force-domain": "~0.1.0",
"node-gyp": "~0.13.0",