Mercurial > prosody-hg
comparison plugins/mod_pubsub/mod_pubsub.lua @ 7269:cde4ef90cf3d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 11 Mar 2016 13:41:10 +0100 |
| parents | 161cccfdf015 |
| children | 9c8eb0239eef |
comparison
equal
deleted
inserted
replaced
| 7263:015a711a8ccf | 7269:cde4ef90cf3d |
|---|