Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7061:eda0feeaf759
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:16:08 +0100 |
| parents | 4688ff9d4f2b |
| children | f094683ae6eb |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:16:08 +0100 |
| parents | 4688ff9d4f2b |
| children | f094683ae6eb |