Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 6608:b6e558febb7a
Merge with merge merge merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:19:44 +0000 |
| parents | c9a72c64c3e2 |
| children | ecd8d6437053 f1af4edd5722 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:19:44 +0000 |
| parents | c9a72c64c3e2 |
| children | ecd8d6437053 f1af4edd5722 |