Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7972:c29de6820fbb
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 11 Mar 2017 17:51:02 +0100 |
| parents | f0e35f4db9e0 |
| children | 62c540d51d50 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 11 Mar 2017 17:51:02 +0100 |
| parents | f0e35f4db9e0 |
| children | 62c540d51d50 |