Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 9600:ae0aca2c0ebb
Merge 0.11->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 31 Oct 2018 13:17:02 +0000 |
| parents | 1d6a2cc389eb |
| children | 02a41315d275 0c35f353db68 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 31 Oct 2018 13:17:02 +0000 |
| parents | 1d6a2cc389eb |
| children | 02a41315d275 0c35f353db68 |