diff options
author | Matthew Wild <mwild1@gmail.com> | 2018-10-30 13:59:53 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2018-10-30 13:59:53 +0000 |
commit | b755ba0921d0be12b002a25803acd648d52d4274 (patch) | |
tree | c00130e8d15d1b0e10aa5fbf2f3a1c729656f219 /doc | |
parent | 9270a17d2089c16c1cb37040f55638867b5adfbe (diff) | |
parent | 65b03e973d2743d38f1ae09283bf7c8c6f72e546 (diff) | |
download | prosody-b755ba0921d0be12b002a25803acd648d52d4274.tar.gz prosody-b755ba0921d0be12b002a25803acd648d52d4274.zip |
Merge 0.11->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions