diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-19 01:05:36 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-19 01:05:36 +0100 |
commit | da42ca2167a2051d2fa85400be3ce0f516909704 (patch) | |
tree | 10c5a2294941641099a92c40f24081bcf121cd8f /.hgignore | |
parent | 59e7a632af33944016e3cbdb8a787a82188314ba (diff) | |
parent | 383aa66ca845f5f85684f9a30f8bc0933513fe98 (diff) | |
download | prosody-da42ca2167a2051d2fa85400be3ce0f516909704.tar.gz prosody-da42ca2167a2051d2fa85400be3ce0f516909704.zip |
Merge 0.10->trunk
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions