Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 6770:cb84731b2dfd
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 27 Jul 2015 09:38:40 +0100 |
| parents | 42aeb882b3e1 |
| children | aeb088bb1a20 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 27 Jul 2015 09:38:40 +0100 |
| parents | 42aeb882b3e1 |
| children | aeb088bb1a20 |