diff options
author | Kim Alvefur <zash@zash.se> | 2017-12-09 15:40:37 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-12-09 15:40:37 +0100 |
commit | e786f43af6f2bda98a586a8029155758a8c82f6b (patch) | |
tree | ca3f01bf0171c53a964ec2b01ee75d8b5dcb625e | |
parent | e368ce5bdb24008282fea4e3a3e2c58ba2889bfb (diff) | |
parent | 6e38411b1617de60d6e700aab4de874118863451 (diff) | |
download | prosody-e786f43af6f2bda98a586a8029155758a8c82f6b.tar.gz prosody-e786f43af6f2bda98a586a8029155758a8c82f6b.zip |
Merge 0.10->trunk
0 files changed, 0 insertions, 0 deletions