Merge remote-tracking branch 'origin/master' into develop

2026-07-05 12:59:13 +02:00 · 2018-02-16 21:23:25 -05:00
parent cb326958cb 2b95b13397
commit 1ce448f2a1
80 changed files with 642 additions and 281 deletions
--- a/src/controllers/admin/blacklist.js
+++ b/src/controllers/admin/blacklist.js
@@ -7,7 +7,6 @@ var analytics = require('../../analytics');
 var blacklistController = module.exports;

 blacklistController.get = function (req, res, next) {
-	// Analytics.getBlacklistAnalytics
 	async.parallel({
 		rules: async.apply(meta.blacklist.get),
 		analytics: async.apply(analytics.getBlacklistAnalytics),