diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-03 00:59:44 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-03 00:59:44 +0200 |
commit | c5edea490f3205da545ac477b4715d35ebd36e70 (patch) | |
tree | 83d383d2fd52f09519e7ba1f11a1f8804f4d78da /doc/names.txt | |
parent | eb6122c3e9c7f34f089bf26f3950f0574b05db46 (diff) | |
parent | 1464d90adbcb4bc02af8974ede36707a5be2c2cb (diff) | |
download | prosody-c5edea490f3205da545ac477b4715d35ebd36e70.tar.gz prosody-c5edea490f3205da545ac477b4715d35ebd36e70.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions