mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-28 16:34:13 +01:00
* ChangeLog: Update.
SVN Revision: 1017
This commit is contained in:
parent
384f4c9196
commit
1795c1a7bb
@ -3,6 +3,7 @@
|
|||||||
* 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>
|
||||||
@ -13,6 +14,9 @@
|
|||||||
|
|
||||||
* 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>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user