Mercurial > prosody-modules
diff mod_s2s_keepalive/mod_s2s_keepalive.lua @ 1641:1fa25cfb0ad4
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 31 Mar 2015 18:31:13 +0200 |
| parents | 2db2c03dfb95 |
| children | 427879b46061 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 31 Mar 2015 18:31:13 +0200 |
| parents | 2db2c03dfb95 |
| children | 427879b46061 |