diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-24 14:19:49 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-24 14:19:49 +0200 |
commit | d53fffb30e060a0b2059d32707ac7b45966375f0 (patch) | |
tree | 13ca49cac213b410c52092725470206f070d7450 /core | |
parent | c55c6b322bc1ee0f5d4aa25aba740433ef7f570f (diff) | |
parent | d40c43dffe69678eb1a63ac6f063b6b7ae8fdcec (diff) | |
download | prosody-d53fffb30e060a0b2059d32707ac7b45966375f0.tar.gz prosody-d53fffb30e060a0b2059d32707ac7b45966375f0.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions