diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-07 13:36:58 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-07 13:36:58 +0200 |
commit | b22eef35d7c97defb727023336fb55a29da0f0e9 (patch) | |
tree | 0f39bb10c828be602edc862719b32395eb31a248 /doc/names.txt | |
parent | 26261c7a51d04fa39653c75c84b7e0566299d934 (diff) | |
parent | bb95b569ef884a8d6558271382acadcac2f87c66 (diff) | |
download | prosody-b22eef35d7c97defb727023336fb55a29da0f0e9.tar.gz prosody-b22eef35d7c97defb727023336fb55a29da0f0e9.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions