diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-12 01:38:47 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-12 01:38:47 +0200 |
commit | 421ef192cadda2c474419071ab8560cdf7de51c4 (patch) | |
tree | 3bba5532ac1efa1c38656bc97d43cda718604029 /.hgignore | |
parent | fd025274c6f71d82cd2494f6c2deadf134f8d45e (diff) | |
parent | ef3f3b099fd0e7b0a7ac2705523ad719ce8a0a33 (diff) | |
download | prosody-421ef192cadda2c474419071ab8560cdf7de51c4.tar.gz prosody-421ef192cadda2c474419071ab8560cdf7de51c4.zip |
Merge 0.10->trunk
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions