fix moment and update .gitignore

This commit is contained in:
Quincy Larson
2015-05-03 16:55:25 -07:00
parent ca1121b721
commit 289a757401
3 changed files with 3 additions and 3 deletions

2
.gitignore vendored
View File

@ -26,4 +26,4 @@ Thumbs.db
bower_components
.eslintignore
.eslintrc
public/css/main.css
main.css

View File

@ -4,7 +4,7 @@ var R = require('ramda'),
Story = require('./../models/Story'),
Comment = require('./../models/Comment'),
User = require('./../models/User'),
moment = require('../public/js/lib/moment/moment.js'),
moment = require('moment'),
resources = require('./resources'),
mongodb = require('mongodb'),
MongoClient = mongodb.MongoClient,

View File

@ -45,7 +45,7 @@
"lodash": "^2.4.1",
"lusca": "^1.0.2",
"method-override": "^2.3.0",
"moment": "^2.8.4",
"moment": "^2.10.2",
"mongodb": "^1.4.33",
"mongoose": "^4.0.1",
"mongoose-long": "0.0.2",