diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-03 18:39:27 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-03 18:39:27 +0200 |
commit | 009cde88a5518e95481126c547bf0b79f95ac797 (patch) | |
tree | 1db58cd52f622c3560457cf589cdc8e6326d28e6 /.hgignore | |
parent | 86867275492107937cea9b5887de077679bc751d (diff) | |
parent | a7606f77d99c798faa7067331e5b9ac0272c5ad1 (diff) | |
download | prosody-009cde88a5518e95481126c547bf0b79f95ac797.tar.gz prosody-009cde88a5518e95481126c547bf0b79f95ac797.zip |
Merge 0.10->trunk
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions