diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-07 13:36:58 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-07 13:36:58 +0200 |
commit | 463289a6f39dee4b37218bfbf949bbc627e99db8 (patch) | |
tree | 0f39bb10c828be602edc862719b32395eb31a248 /plugins/mod_s2s | |
parent | 55e77cd89d5969fe0892fd573fe79be6bea9716f (diff) | |
parent | c82d43ec124fcc2bc8a3c516a6f9ec838c64efef (diff) | |
download | prosody-463289a6f39dee4b37218bfbf949bbc627e99db8.tar.gz prosody-463289a6f39dee4b37218bfbf949bbc627e99db8.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
0 files changed, 0 insertions, 0 deletions