Mercurial > prosody-hg
comparison plugins/mod_pubsub/pubsub.lib.lua @ 6727:eb9c842b80fa
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | 7c8f58d2b331 |
| children | be87ab2d611c |
comparison
equal
deleted
inserted
replaced
| 6723:fb25dce69d41 | 6727:eb9c842b80fa |
|---|
