25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Commit Graph

8 Commits

Author SHA1 Message Date
Eric Cestari
caa8d0c411 Merge branch '2.2.x' of git+ssh://gitorious.process-one.net/~ecestari/ejabberd/ecestaris-maincustomers into 2.2.x 2010-09-16 10:54:45 +02:00
Eric Cestari
8ecf8d7e27 A few additions to .gitignore 2010-09-09 16:16:46 +02:00
Eric Cestari
49a3424a26 add *.so to .gitignore 2010-09-08 17:21:49 +02:00
Christophe Romain
4862251f34 Add gitignore 2010-07-13 18:45:32 +02:00
Badlop
2e1bb5f0e6 * .gitignore: Removed (EJAB-441)
* src/.cvsignore: Likewise

SVN Revision: 1021
2007-12-04 21:40:25 +00:00
Jérôme Sautret
96ded4535d * 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
2007-10-30 17:38:40 +00:00
Mickaël Rémond
9dd8e1bf04 Ignore more files in git.
SVN Revision: 940
2007-09-14 14:19:35 +00:00
Mickaël Rémond
d7e8374a07 Don't track some files in git.
SVN Revision: 939
2007-09-14 14:19:22 +00:00