Merge branch 'merge/xep-0364'

This commit is contained in:
Jonas Schäfer 2019-08-20 18:26:50 +02:00
commit 21a8cd43d5
1 changed files with 3 additions and 3 deletions

View File

@ -313,14 +313,14 @@ xmpp:feste@allfools.lit?otr-fingerprint=AEA4D503298797D4A4FC823BC1D24524B4C54338
<section1 topic='Acknowledgements' anchor='acks'>
<p>
Thanks to Daniel Gultsch for his excellent
<link url='https://github.com/siacs/Conversations/blob/development/docs/observations.md'>
<link url='https://github.com/siacs/Conversations/blob/master/docs/observations.md'>
article
</link>
<note>
Daniel Gultsch (Retreived on 2015-07-29). "Observations on Implementing
XMPP"
&lt;<link url='https://github.com/siacs/Conversations/blob/development/docs/observations.md'>
https://github.com/siacs/Conversations/blob/development/docs/observations.md
&lt;<link url='https://github.com/siacs/Conversations/blob/master/docs/observations.md'>
https://github.com/siacs/Conversations/blob/master/docs/observations.md
</link>&gt;
</note>
on the pitfalls of implementing OTR, and to Georg Lukas and Chris