Mercurial > prosody-hg
diff plugins/mod_blocklist.lua @ 6581:f2a7ad099e01
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Feb 2015 15:22:34 +0000 |
| parents | 18f4973849b1 |
| children | 42aeb882b3e1 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Feb 2015 15:22:34 +0000 |
| parents | 18f4973849b1 |
| children | 42aeb882b3e1 |