Software `/` code `/` prosody

Changeset

11120:b2331f3dfeea

Merge 0.11->trunk

author Matthew Wild <mwild1@gmail.com>

date Wed, 30 Sep 2020 09:50:33 +0100

parents 11119:68df52bf08d5 (diff) 11116:d334f2bebe55 (current diff)

children 11121:2d38242a08dd

files doc/coding_style.txt net/connlisteners.lua net/http/files.lua plugins/mod_c2s.lua plugins/mod_s2s.lua plugins/mod_s2s/mod_s2s.lua plugins/mod_s2s/s2sout.lib.lua tools/migration/migrator/mtools.lua tools/migration/migrator/prosody_files.lua tools/migration/migrator/prosody_sql.lua util/sasl/digest-md5.lua

diffstat

1 files changed, 2 insertions(+), 0 deletions(-) [+]

line wrap: on

line diff

--- a/.hgtags	Wed Sep 30 07:25:32 2020 +0100
+++ b/.hgtags	Wed Sep 30 09:50:33 2020 +0100
@@ -73,3 +73,5 @@
 10d6d0d91f4ec47a6eb446792fee1d4b79a914d7 0.11.4
 dbd60f47316492bc367802914dc8fa47f4b3edac 0.11.5
 bacca65ce107b8549ce5f9079e81e5771eed2021 0.11.6
+0000000000000000000000000000000000000000 0.11.7
+ece430d4980997b216c2240015bf922bdeb12dd6 0.11.7