Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 7900:41f783d4e127
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 15 Feb 2017 23:05:03 +0100 |
| parents | d0390bc9c5d1 |
| children | 352d605b1178 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 15 Feb 2017 23:05:03 +0100 |
| parents | d0390bc9c5d1 |
| children | 352d605b1178 |