Holger Weiss d343447cc9 Merge remote-tracking branch 'processone/master' into xep-0198 ... Conflicts: doc/guide.tex src/ejabberd_c2s.erl		2014-05-06 21:41:29 +02:00
..
ELDAPv3.hrl	Do not generate LDAP's ASN.1 code when compiling ejabberd.	2013-06-22 03:27:59 +10:00
adhoc.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
ejabberd.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
ejabberd_commands.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
ejabberd_config.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
ejabberd_ctl.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
ejabberd_http.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
ejabberd_web_admin.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
eldap.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
http_bind.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
jlib.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
logger.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
mod_muc_room.hrl	Make it possible to get/set vCards for MUC rooms	2014-05-04 23:23:17 +04:00
mod_privacy.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
mod_proxy65.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
mod_roster.hrl	Merge pull request #146 from jamielinux/master	2014-04-11 13:35:46 +02:00
ns.hrl	Merge remote-tracking branch 'processone/master' into xep-0198	2014-05-06 21:41:29 +02:00
pubsub.hrl	Update copyright dates to 2014 (EJAB-1679)	2014-03-13 12:30:57 +01:00