Alexey Shchepin 24ff98d50d Fixed conflict ... SVN Revision: 887		2007-08-24 16:18:46 +00:00
..
ejabberd_http_poll.erl	* src/ejabberd_receiver.erl: Workaround for inet_drv bug	2007-05-07 17:52:35 +00:00
ejabberd_http.erl	Cancel revision 798	2007-06-27 11:05:14 +00:00
ejabberd_http.hrl	Cancel revision 798	2007-06-27 11:05:14 +00:00
ejabberd_web_admin.erl	Fixed conflict	2007-08-24 16:18:46 +00:00
ejabberd_web_admin.hrl	* src/web/ejabberd_web_admin.erl: Added hooks to allow plugins to	2007-08-23 00:51:54 +00:00
ejabberd_web.erl	Cancel revision 798	2007-06-27 11:05:14 +00:00
Makefile.in	* src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant)	2007-05-29 14:31:12 +00:00
Makefile.win32	* src/mod_muc/mod_muc.erl: Added access rules for using serveice	2004-05-17 20:36:41 +00:00