Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7868:11fcdef5022f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 26 Jan 2017 19:47:33 +0100 |
| parents | 3733bdbe0b22 |
| children | f0e35f4db9e0 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 26 Jan 2017 19:47:33 +0100 |
| parents | 3733bdbe0b22 |
| children | f0e35f4db9e0 |