diff options
author | Kim Alvefur <zash@zash.se> | 2019-01-22 10:44:24 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-01-22 10:44:24 +0100 |
commit | 2748b1f5ec7b48eae6bc8ebeb4db84f8e62cd963 (patch) | |
tree | edac628d90878379d6fe710e7ac184a448c7350e /core | |
parent | 54bfc5180fd94c731b4f021ed1ea142079fc1511 (diff) | |
parent | f8d61d21e5521c7ef5863fde23500298cc21467d (diff) | |
download | prosody-2748b1f5ec7b48eae6bc8ebeb4db84f8e62cd963.tar.gz prosody-2748b1f5ec7b48eae6bc8ebeb4db84f8e62cd963.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions