mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-03 12:36:02 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
"use strict";
|
||||
'use strict';
|
||||
|
||||
var adminController = {
|
||||
dashboard: require('./admin/dashboard'),
|
||||
@@ -9,7 +9,7 @@ var adminController = {
|
||||
appearance: require('./admin/appearance'),
|
||||
extend: {
|
||||
widgets: require('./admin/widgets'),
|
||||
rewards: require('./admin/rewards')
|
||||
rewards: require('./admin/rewards'),
|
||||
},
|
||||
events: require('./admin/events'),
|
||||
logs: require('./admin/logs'),
|
||||
@@ -27,7 +27,7 @@ var adminController = {
|
||||
themes: require('./admin/themes'),
|
||||
users: require('./admin/users'),
|
||||
uploads: require('./admin/uploads'),
|
||||
info: require('./admin/info')
|
||||
info: require('./admin/info'),
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user