Mercurial > prosody-hg
diff tools/openfire2prosody.lua @ 6723:fb25dce69d41
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 19 May 2015 16:33:18 +0100 |
| parents | bd0ff8ae98a8 |
| children | 879a6a33c21b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 19 May 2015 16:33:18 +0100 |
| parents | bd0ff8ae98a8 |
| children | 879a6a33c21b |