aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-24 14:18:25 +0100
committerKim Alvefur <zash@zash.se>2016-11-24 14:18:25 +0100
commitd77094644a04481987b841c25f5ef987be1a3a88 (patch)
tree092bb85e6687d0c7bfd65269db958ac16a60d37c /doc
parent58a712e247dbaede24c3297260bae145e0ede16e (diff)
parentf91ba70e322e1ec1fcd42dfc0189fb9b80939034 (diff)
downloadprosody-d77094644a04481987b841c25f5ef987be1a3a88.tar.gz
prosody-d77094644a04481987b841c25f5ef987be1a3a88.zip
Merge 0.9->0.10
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions