diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-28 20:14:35 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-28 20:14:35 +0200 |
commit | f389cff7eaeff6492874a0808bb8bf1ec9fb78fd (patch) | |
tree | 596c926edd7d0a89f2919aad8b9554b048283f75 /doc/names.txt | |
parent | e4c17b311b1f0880958aaf93ad31c00872a7c719 (diff) | |
parent | 0f578fb9f3e81bfd847785562900adc3c47740d9 (diff) | |
download | prosody-f389cff7eaeff6492874a0808bb8bf1ec9fb78fd.tar.gz prosody-f389cff7eaeff6492874a0808bb8bf1ec9fb78fd.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions