diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-11-24 16:45:05 +0900 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-11-24 16:45:05 +0900 |
| commit | b8d6aee1ce228f397ac2f913b3b7f824b6c4f562 (patch) | |
| tree | 1cb6337e410c160004c96e2a7fef06d0b101d8e6 /src/xml.erl | |
| parent | Updating Brazilian Portuguese (pt_BR) translations for v2.1.6 (diff) | |
| parent | implement lifetime for broken hashes (diff) | |
Merge branch 'caps' into 2.1.x
Conflicts:
src/ejabberd_c2s.erl
Diffstat (limited to 'src/xml.erl')
0 files changed, 0 insertions, 0 deletions