Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7719:17c7e3ac47f7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 17 Nov 2016 23:20:41 +0100 |
| parents | b8c03df6e8ca |
| children | 2b288dab781a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 17 Nov 2016 23:20:41 +0100 |
| parents | b8c03df6e8ca |
| children | 2b288dab781a |