Mercurial > prosody-modules
diff mod_s2s_blacklist/mod_s2s_blacklist.lua @ 1524:604a8cee9d58
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 13 Oct 2014 14:31:16 +0200 |
parents | b21236b6b8d8 |
children | d958558e0058 |
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 13 Oct 2014 14:31:16 +0200 |
parents | b21236b6b8d8 |
children | d958558e0058 |