diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2007-08-24 16:18:46 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2007-08-24 16:18:46 +0000 |
| commit | 24ff98d50d551c21a92177347a377888a853350f (patch) | |
| tree | 572a21dd7fb0e083f11c24c006573606b4449c1e /src/mod_proxy65 | |
| parent | * src/web/ejabberd_web_admin.erl: Moved roster stuff to mod_roster* (diff) | |
Fixed conflict
SVN Revision: 887
Diffstat (limited to 'src/mod_proxy65')
0 files changed, 0 insertions, 0 deletions