Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7779:b1f80447a2b1
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 Dec 2016 17:07:57 +0100 |
| parents | 3733bdbe0b22 |
| children | f0e35f4db9e0 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 Dec 2016 17:07:57 +0100 |
| parents | 3733bdbe0b22 |
| children | f0e35f4db9e0 |