Merge remote-tracking branch 'upstream/master' into master-to-security

This commit is contained in:
Erik Boasson 2020-03-19 08:18:48 +01:00
commit 67c49235db
110 changed files with 2714 additions and 4540 deletions

View file

@ -1619,7 +1619,7 @@ handshake;</li>
<li><i>dq.CHAN</i>: delivery thread for channel CHAN;</li>
<li><i>tev.CHAN</i>: timed-even thread for channel CHAN.</li></ul>""" ] ]
<li><i>tev.CHAN</i>: timed-event thread for channel CHAN.</li></ul>""" ] ]
attribute Name {
text
}