Software /
code /
prosody
Comparison
.hgtags @ 8794:0e2c1c4d4f78
Merge 0.10 -> trunk
This commit intentionally drops changes from c2b99fa134b3
and 8da11142fabf which are based on older MUC code.
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Wed, 16 May 2018 23:50:08 +0100 |
parent | 8790:85f13967eb07 |
child | 8846:7ec098b68042 |
comparison
equal
deleted
inserted
replaced
8788:7a9b680a79fb | 8794:0e2c1c4d4f78 |
---|---|
60 352270bc04393910a567b569ede03358dbb728b5 0.9.10 | 60 352270bc04393910a567b569ede03358dbb728b5 0.9.10 |
61 8613086779fa9276615c2af066d2a10c38d0c86e 0.9.11 | 61 8613086779fa9276615c2af066d2a10c38d0c86e 0.9.11 |
62 2a7b52437167a5c7b6c8a5bc79f4463afe092fd5 0.9.12 | 62 2a7b52437167a5c7b6c8a5bc79f4463afe092fd5 0.9.12 |
63 39966cbc29f46d7ae9660edca8683d5121c82edf 0.10.0 | 63 39966cbc29f46d7ae9660edca8683d5121c82edf 0.10.0 |
64 082d127286451eb55420c36424dd321e8d9bceee 0.9.13 | 64 082d127286451eb55420c36424dd321e8d9bceee 0.9.13 |
65 4ae8dd415e9431924ad4aa0b57bcee8a4a9272f8 0.10.1 |