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