Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 7738:0647b821e00a
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 24 Nov 2016 14:18:25 +0100 |
| parents | c420a38db5ef |
| children | 9c8eb0239eef 241f02bd66ce |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 24 Nov 2016 14:18:25 +0100 |
| parents | c420a38db5ef |
| children | 9c8eb0239eef 241f02bd66ce |