diff options
author | Kim Alvefur <zash@zash.se> | 2018-06-08 16:15:32 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-06-08 16:15:32 +0200 |
commit | fd873fa69344b42bdd648ea6115f1856ca738eb1 (patch) | |
tree | f9ef6854b63e7638dee3dd6ec46d6301d009494a /doc/names.txt | |
parent | fb4b9afe24bf079e66f1aa9870fec02c34a5c6c7 (diff) | |
parent | 1b392befb7610cd3286312a01c9bef649ec87fc8 (diff) | |
download | prosody-fd873fa69344b42bdd648ea6115f1856ca738eb1.tar.gz prosody-fd873fa69344b42bdd648ea6115f1856ca738eb1.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions