aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-31 19:01:42 +0200
committerKim Alvefur <zash@zash.se>2017-03-31 19:01:42 +0200
commit7eb36daf82fa0db2544118d950bed17b0c6faa93 (patch)
treebee3cc0bc75de8d1aa4fb7ea7ca6571c449ac139 /prosody
parentf389cff7eaeff6492874a0808bb8bf1ec9fb78fd (diff)
parentd36a5333ea6c3d3d7806450f836dd132848f667b (diff)
downloadprosody-7eb36daf82fa0db2544118d950bed17b0c6faa93.tar.gz
prosody-7eb36daf82fa0db2544118d950bed17b0c6faa93.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions