diff options
| author | Jérôme Sautret <jerome.sautret@process-one.net> | 2007-10-30 20:38:40 +0300 |
|---|---|---|
| committer | Jérôme Sautret <jerome.sautret@process-one.net> | 2007-10-30 20:38:40 +0300 |
| commit | 96ded4535d30a703b03caae9e24f27f0cad25122 (patch) | |
| tree | 5aca94c524ae7e870bd3b30651703ba4e47f674b /.gitignore | |
| parent | 990514eef91be42f9ff0ddb97ff453159d4658cb (diff) | |
* src/ejabberd_s2s.erl: don't use the resource of the sender to choose
a s2s connection to ensure that a muc room always uses the same
connection
Merge branch 'ejabberd_s2s'
Conflicts:
.gitignore
src/configure
src/ejabberd_c2s.erl
src/ejabberd_s2s.erl
SVN Revision: 963
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c87d57d0d..8df1e60f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ *.beam *~ *.so +*.flc +*.log +erl_crash.dump +ejabberd.cfg +ejabberd.sh +Mnesia.* Makefile XmppAddr.asn1db XmppAddr.erl |