Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 7516:f74ff35a4b03
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parents | d0390bc9c5d1 |
| children | 352d605b1178 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parents | d0390bc9c5d1 |
| children | 352d605b1178 |