Mercurial > prosody-hg
comparison core/rostermanager.lua @ 6908:047becf393ca
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 17 Oct 2015 19:31:43 +0200 |
| parents | ad64e2eacd0e |
| children | b98006bfd97a |
comparison
equal
deleted
inserted
replaced
| 6905:0e81e3dab896 | 6908:047becf393ca |
|---|
