aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 19:00:19 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 19:00:19 +0200
commitfd873c5d1338091f466e74683d85e6f1121969b1 (patch)
tree451c26ca6d2bb35b6dfded6ba677efe19250eef5 /doc
parent5133e1cf8997e8a396dd335c4b93ab3d6612e733 (diff)
parenta31f68cb0df7a56f3e516377992df4d25f90395a (diff)
downloadprosody-fd873c5d1338091f466e74683d85e6f1121969b1.tar.gz
prosody-fd873c5d1338091f466e74683d85e6f1121969b1.zip
Merge 0.9->0.10
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions