Mercurial > prosody-hg
diff plugins/mod_presence.lua @ 7048:b58fd349ddfe
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 04 Jan 2016 09:14:57 +0000 |
| parents | 2aae36312eb9 |
| children | 78be11bf62bf |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 04 Jan 2016 09:14:57 +0000 |
| parents | 2aae36312eb9 |
| children | 78be11bf62bf |