Merge remote-tracking branch 'origin' into notifications

Conflicts: src/webserver.js
2025-10-31 11:05:54 +01:00 · 2013-05-23 13:24:27 -04:00
parent 78713f0599 cd4ca110a1
commit 1f7ab82f78
12 changed files with 129 additions and 103 deletions
--- a/src/user.js
+++ b/src/user.js
@@ -1,5 +1,5 @@
 var config = require('../config.js'),
-	utils = require('./utils.js'),
+	utils = require('./../public/src/utils.js'),
 	RDB = require('./redis.js'),
 	crypto = require('crypto'),
 	emailjs = require('emailjs'),