moparisthebest
/
xeps
mirror of https://github.com/moparisthebest/xeps
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'merge/xep-0364'

This commit is contained in:
Jonas Schäfer 2019-08-20 18:26:50 +02:00
parent 6a8871d045 40184e7ede
commit 21a8cd43d5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xep-0364.xml
View File

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