Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7496:98c8d14be4ef
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | f094683ae6eb |
| children | c27c9695d130 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | f094683ae6eb |
| children | c27c9695d130 |