Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

* ChangeLog: Fix conflict.

Browse Source 
SVN Revision: 1018
This commit is contained in:
Mickaël Rémond 2007-12-03 10:51:22 +00:00
parent 1795c1a7bb
commit f8c4e86977
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,7 +3,6 @@
* src/mod_muc.erl: Added option to limit the number of room a user is * src/mod_muc.erl: Added option to limit the number of room a user is
allowed to connect to (EJAB-445). allowed to connect to (EJAB-445).
* src/mod_muc_room.erl: Likewise. * src/mod_muc_room.erl: Likewise.
<<<<<<< HEAD:ChangeLog
* doc/guide.tex: Likewise.:ChangeLog * doc/guide.tex: Likewise.:ChangeLog
2007-12-02 Badlop <badlop@process-one.net> 2007-12-02 Badlop <badlop@process-one.net>
@ -14,9 +13,6 @@
* src/Makefile.in: New options make uninstall and * src/Makefile.in: New options make uninstall and
uninstall-all (EJAB-293) uninstall-all (EJAB-293)
=======
* doc/guide.tex: Likewise.
>>>>>>> * ChangeLog: Update.:ChangeLog
2007-12-01 Mickael Remond <mremond@process-one.net> 2007-12-01 Mickael Remond <mremond@process-one.net>