diff options
author | Kim Alvefur <zash@zash.se> | 2016-07-14 13:41:02 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-07-14 13:41:02 +0200 |
commit | 7a96aa1a3cd45cbba3efb233174aeef5f1152324 (patch) | |
tree | 7f1c0c36f5c9dadc79cbec11d668ba0bdef0d36f /.hgignore | |
parent | 50bd70e55fef42f6ec053a0662d39471c59dbde0 (diff) | |
parent | 4f147a612741c20c8eb2783030dabbbf3b30ebc5 (diff) | |
download | prosody-7a96aa1a3cd45cbba3efb233174aeef5f1152324.tar.gz prosody-7a96aa1a3cd45cbba3efb233174aeef5f1152324.zip |
Merge 0.10->trunk
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions