diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-05-04 14:19:52 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-05-04 14:19:52 +1000 |
| commit | 75d3152a0f87c9c706ba306cb3b8725cfd81818e (patch) | |
| tree | 5f4d6f03d1abc79c94e07c7e486e0efb101dfc3e /doc/guide.tex | |
| parent | Remove CRLFs introduced in the previous merge (diff) | |
| parent | Repeated http-bind request should abort only requests with same rid (diff) | |
Merge branch '2.1.x' into 2.2.x
Conflicts:
src/mod_muc/mod_muc.erl
src/mod_muc/mod_muc_room.erl
src/mod_offline.erl
src/mod_offline_odbc.erl
src/mod_shared_roster.erl
src/web/ejabberd_http_bind.erl
Diffstat (limited to 'doc/guide.tex')
0 files changed, 0 insertions, 0 deletions