diff options
author | Kim Alvefur <zash@zash.se> | 2017-09-21 02:36:28 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-09-21 02:36:28 +0200 |
commit | 43e5d4df2985e069c52fb21e4636e3e44053d1bf (patch) | |
tree | af392dbae3065aa54b4a971eb3c368a74624958d /doc | |
parent | 8cb654ff632fd09ca39941952bd09e2f5d45cecc (diff) | |
parent | 1574b7a818dfd40ba2fd5cb3ebf8687ba5a37a4d (diff) | |
download | prosody-43e5d4df2985e069c52fb21e4636e3e44053d1bf.tar.gz prosody-43e5d4df2985e069c52fb21e4636e3e44053d1bf.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions