Commit 3a1bd7c4 authored by JC Brand's avatar JC Brand

Remove duplicate allow_muc and sort

parent a5b5e753
...@@ -70,20 +70,19 @@ ...@@ -70,20 +70,19 @@
'auto_list_rooms', 'auto_list_rooms',
'auto_subscribe', 'auto_subscribe',
'bosh_service_url', 'bosh_service_url',
'fullname', 'connection',
'debug', 'debug',
'fullname',
'hide_muc_server', 'hide_muc_server',
'i18n', 'i18n',
'allow_muc', 'jid',
'prebind', 'prebind',
'rid',
'show_controlbox_by_default', 'show_controlbox_by_default',
'xhr_user_search',
'xhr_custom_status',
'connection',
'testing',
'jid',
'sid', 'sid',
'rid' 'testing',
'xhr_custom_status',
'xhr_user_search'
]; ];
_.extend(this, _.pick(settings, whitelist)); _.extend(this, _.pick(settings, whitelist));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment