Mercurial > prosody-hg
diff plugins/mod_roster.lua @ 7242:d0296db76ccd
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 2aae36312eb9 |
| children | c8ad387aab1c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 2aae36312eb9 |
| children | c8ad387aab1c |