Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 7107:e7d199c2a22d
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 27 Jan 2016 20:38:09 +0000 |
| parents | f094683ae6eb |
| children | c27c9695d130 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 27 Jan 2016 20:38:09 +0000 |
| parents | f094683ae6eb |
| children | c27c9695d130 |