diff options
author | Kim Alvefur <zash@zash.se> | 2019-02-27 10:29:10 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-02-27 10:29:10 +0100 |
commit | 0045fa7647f01581eab8d344f9e755f98d3aa910 (patch) | |
tree | 37fe46a5b5792dd58e4b6dca80b2e6e0829156f5 /core | |
parent | 8518868d4192e48f1f7529970dca3bae4364f43b (diff) | |
parent | 3b8e8f6a452feb5a7e2fde95af5d827bc9ce4e8e (diff) | |
download | prosody-0045fa7647f01581eab8d344f9e755f98d3aa910.tar.gz prosody-0045fa7647f01581eab8d344f9e755f98d3aa910.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions