Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 7269:cde4ef90cf3d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 11 Mar 2016 13:41:10 +0100 |
| parents | be87ab2d611c |
| children | d0390bc9c5d1 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 11 Mar 2016 13:41:10 +0100 |
| parents | be87ab2d611c |
| children | d0390bc9c5d1 |