Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 6689:53bfca69c48b
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 May 2015 22:32:40 +0200 |
| parents | f1af4edd5722 |
| children | 42fdc8dddf04 be87ab2d611c |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 May 2015 22:32:40 +0200 |
| parents | f1af4edd5722 |
| children | 42fdc8dddf04 be87ab2d611c |