Mercurial > prosody-hg
comparison plugins/mod_pubsub/pubsub.lib.lua @ 6988:329d5fb8a9d3
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2015 18:58:30 +0000 |
| parents | be87ab2d611c |
| children | d0390bc9c5d1 |
comparison
equal
deleted
inserted
replaced
| 6978:30c96a5db360 | 6988:329d5fb8a9d3 |
|---|
