Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 6609:d2faaaca695d
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:24:57 +0000 |
| parents | 18f4973849b1 |
| children | 42aeb882b3e1 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:24:57 +0000 |
| parents | 18f4973849b1 |
| children | 42aeb882b3e1 |