diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-07-29 14:58:42 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-07-29 14:58:42 +0100 |
commit | ac5a68baa5d74a79b96013ee2660419026a43b32 (patch) | |
tree | 47793a1698f0b6d69fa8610ec0fc20b708e96442 /doc | |
parent | bf39a5e45f3a3f988aadea1dc968f66a23721767 (diff) | |
parent | 1eb4ec4922c25d0446cbdca54353085b094585e6 (diff) | |
download | prosody-ac5a68baa5d74a79b96013ee2660419026a43b32.tar.gz prosody-ac5a68baa5d74a79b96013ee2660419026a43b32.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions