diff options
author | Kim Alvefur <zash@zash.se> | 2015-10-11 20:03:00 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-10-11 20:03:00 +0200 |
commit | ec268ace11395bb845a401852b9f49918947ae52 (patch) | |
tree | 38ce0d5d3bebeb2cc1e63965c9492ee0a8526dc9 /.hgignore | |
parent | 6c79c243796faaa674eb591a15257a965b9f30ae (diff) | |
parent | 7835e7573e12cc36b70110705dd7b5571d26fbb9 (diff) | |
download | prosody-ec268ace11395bb845a401852b9f49918947ae52.tar.gz prosody-ec268ace11395bb845a401852b9f49918947ae52.zip |
Merge 0.10->trunk
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions