aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-25 18:11:24 +0200
committerKim Alvefur <zash@zash.se>2015-09-25 18:11:24 +0200
commit3d29bb52de30cc4662a167d2cdab046c7d642b74 (patch)
treeacb98cdf0005d65cefb429affb0e7d9d11cf37f7 /doc
parentc77e828701faec6e9d1321a57440453e868ab9a0 (diff)
parenta10c1e367fdd3fd641596b4276765c0286ca3ea0 (diff)
downloadprosody-3d29bb52de30cc4662a167d2cdab046c7d642b74.tar.gz
prosody-3d29bb52de30cc4662a167d2cdab046c7d642b74.zip
Merge 0.9->0.10
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions