Merge branch 'code-quality' of https://github.com/miksago/NodeBB into miksago-code-quality

Conflicts:
	src/database.js

src/controllers/accounts.js

@@ -468,4 +468,4 @@ accountsController.getNotifications = function(req, res, next) {
 	});
 };
 
-module.exports = accountsController;
+module.exports = accountsController;

src/controllers/admin.js

@@ -169,4 +169,4 @@ adminController.sounds.get = function(req, res, next) {
 	});
 };
 
-module.exports = adminController;
+module.exports = adminController;

src/controllers/admin/users.js

@@ -47,4 +47,4 @@ usersController.getCSV = function(req, res, next) {
 	});
 };
 
-module.exports = usersController;
+module.exports = usersController;

src/controllers/api.js

@@ -70,4 +70,4 @@ apiController.getConfig = function(req, res, next) {
 };
 
 
-module.exports = apiController;
+module.exports = apiController;

src/controllers/index.js

@@ -266,4 +266,4 @@ Controllers.outgoing = function(req, res, next) {
 	}
 };
 
-module.exports = Controllers;
+module.exports = Controllers;

src/controllers/topics.js

@@ -181,4 +181,4 @@ topicsController.get = function(req, res, next) {
 	});
 };
 
-module.exports = topicsController;
+module.exports = topicsController;

src/controllers/users.js

@@ -100,4 +100,4 @@ usersController.getUsersForSearch = function(req, res, next) {
 
 
 
-module.exports = usersController;
+module.exports = usersController;