Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

Conflicts: src/controllers/auth.js src/controllers/challenges.js src/controllers/groups.js src/controllers/members.js src/controllers/payments/index.js src/controllers/user.js src/middleware.js src/models/user.js
2015-02-03 21:13:55 -06:00
parent a59067def7 035fe8c0de
commit cc767efa20
25 changed files with 600 additions and 250 deletions
@@ -5,6 +5,7 @@ require('winston-newrelic');

 var logger, loggly;

+// Currently disabled
 if (nconf.get('LOGGLY:enabled')){
  loggly = require('loggly').createClient({
    token: nconf.get('LOGGLY:token'),