Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7195:39b7ea9141c0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 25 Feb 2016 15:40:35 +0100 |
| parents | f094683ae6eb |
| children | c27c9695d130 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 25 Feb 2016 15:40:35 +0100 |
| parents | f094683ae6eb |
| children | c27c9695d130 |