Mercurial > prosody-hg
diff plugins/mod_roster.lua @ 7438:6bf4c227c8f3
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 May 2016 20:07:20 +0100 |
| parents | 566d0a56b37f |
| children | 0d31d8052dd8 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 May 2016 20:07:20 +0100 |
| parents | 566d0a56b37f |
| children | 0d31d8052dd8 |