Mercurial > prosody-hg
comparison core/rostermanager.lua @ 6988:329d5fb8a9d3
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2015 18:58:30 +0000 |
| parents | ad64e2eacd0e |
| children | b98006bfd97a |
comparison
equal
deleted
inserted
replaced
| 6978:30c96a5db360 | 6988:329d5fb8a9d3 |
|---|
