diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
commit | 0e4e770687183e78e70ea16d056c039062b3708f (patch) | |
tree | 2e6a296aac1eb2dbf8f40a56235d32870b270b99 /.hgignore | |
parent | e8cb3e473a07e28039c0b41ab1ee83db524364f5 (diff) | |
parent | b9c17069eac26443575ceee3674a12cb41df4f52 (diff) | |
download | prosody-0e4e770687183e78e70ea16d056c039062b3708f.tar.gz prosody-0e4e770687183e78e70ea16d056c039062b3708f.zip |
Merge 0.10->trunk
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions