Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 6605:03a43bf3ecd2
Merge with merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 27 Mar 2015 00:28:16 +0100 |
| parents | 7c8f58d2b331 |
| children | be87ab2d611c |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 27 Mar 2015 00:28:16 +0100 |
| parents | 7c8f58d2b331 |
| children | be87ab2d611c |