Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 7063:bc1b375f379e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:21:05 +0100 |
| parents | 161cccfdf015 |
| children | 9c8eb0239eef |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:21:05 +0100 |
| parents | 161cccfdf015 |
| children | 9c8eb0239eef |