Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 6623:0da3e10b3333
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 05 Apr 2015 15:22:33 +0200 |
| parents | 18f4973849b1 |
| children | 42aeb882b3e1 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 05 Apr 2015 15:22:33 +0200 |
| parents | 18f4973849b1 |
| children | 42aeb882b3e1 |