jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44 from weiss/update-mod-muc-room-header 

Update mod_muc_room header from ejabberd master
This commit is contained in:
badlop 2014-07-28 18:09:11 +02:00
parent 750170f27d 07d5e77cc6
commit ccf95a6fc8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ejabberd-dev/include/mod_muc_room.hrl
View File

@ -1,6 +1,6 @@
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
%%% %%%
%%% ejabberd, Copyright (C) 2002-2013 ProcessOne %%% ejabberd, Copyright (C) 2002-2014 ProcessOne
%%% %%%
%%% This program is free software; you can redistribute it and/or %%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as %%% modify it under the terms of the GNU General Public License as
@ -12,10 +12,9 @@
%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
%%% General Public License for more details. %%% General Public License for more details.
%%% %%%
%%% You should have received a copy of the GNU General Public License %%% You should have received a copy of the GNU General Public License along
%%% along with this program; if not, write to the Free Software %%% with this program; if not, write to the Free Software Foundation, Inc.,
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
%%% 02111-1307 USA
%%% %%%
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
@ -59,6 +58,7 @@
voice_request_min_interval = 1800 :: non_neg_integer(), voice_request_min_interval = 1800 :: non_neg_integer(),
max_users = ?MAX_USERS_DEFAULT :: non_neg_integer() | none, max_users = ?MAX_USERS_DEFAULT :: non_neg_integer() | none,
logging = false :: boolean(), logging = false :: boolean(),
vcard = <<"">> :: boolean(),
captcha_whitelist = (?SETS):empty() :: gb_set() captcha_whitelist = (?SETS):empty() :: gb_set()
}). }).