Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 6988:329d5fb8a9d3
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2015 18:58:30 +0000 |
| parents | 4688ff9d4f2b |
| children | f094683ae6eb |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2015 18:58:30 +0000 |
| parents | 4688ff9d4f2b |
| children | f094683ae6eb |