Merge remote-tracking branch 'origin/master'

This commit is contained in:
Cooldude2606
2019-01-19 14:34:13 +00:00

View File

@@ -86,6 +86,7 @@ Role{
['set-home']=true, ['set-home']=true,
['home']=true, ['home']=true,
['return']=true, ['return']=true,
['bonus']=true,
['announcements']=true, ['announcements']=true,
['rank-changer']=true, ['rank-changer']=true,
} }
@@ -275,4 +276,4 @@ Role.set_preassign{
["arty714"]={"Admin","Community Manager","Member","Mod"}, ["arty714"]={"Admin","Community Manager","Member","Mod"},
["drahc_pro"]={"Admin","Member","Mod"}, ["drahc_pro"]={"Admin","Member","Mod"},
["mark9064"]={"Admin","Member","Mod"} ["mark9064"]={"Admin","Member","Mod"}
} }