Merge branch 'master' into develop

This commit is contained in:
Julian Lam
2016-12-20 13:29:44 -05:00
1948 changed files with 45247 additions and 1514 deletions

View File

@@ -9,7 +9,7 @@ blacklistController.get = function (req, res, next) {
if (err) {
return next(err);
}
res.render('admin/manage/ip-blacklist', {rules: rules, title: 'IP Blacklist'});
res.render('admin/manage/ip-blacklist', { rules: rules });
});
};