aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-18 15:16:02 +0200
committerKim Alvefur <zash@zash.se>2016-08-18 15:16:02 +0200
commit860d3a58b873ee2289a989341e22cb46ebee947b (patch)
tree224750aa24bd1f26b3e06e6f96a735c2118465e7 /core
parent4c89d041878972b771a7a593f9358c6bdb17d6c7 (diff)
parent1686ef5d53d3d84d35ebebab89b8d1b22dcf021e (diff)
downloadprosody-860d3a58b873ee2289a989341e22cb46ebee947b.tar.gz
prosody-860d3a58b873ee2289a989341e22cb46ebee947b.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions