Mercurial > prosody-modules
diff mod_block_s2s_subscriptions/mod_block_s2s_subscriptions.lua @ 1012:c53a1b8a1cfa
Merge
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 14 May 2013 16:27:05 +0100 |
parents | 70ff25db37fa |
children |
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 14 May 2013 16:27:05 +0100 |
parents | 70ff25db37fa |
children |