Mercurial > prosody-hg
comparison plugins/mod_pubsub/mod_pubsub.lua @ 7438:6bf4c227c8f3
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 May 2016 20:07:20 +0100 |
| parents | 161cccfdf015 |
| children | 9c8eb0239eef |
comparison
equal
deleted
inserted
replaced
| 7437:ff74188488ab | 7438:6bf4c227c8f3 |
|---|