1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-21 16:55:07 -05:00

Merge commit 'refs/pull/748/head' of https://github.com/xsf/xeps

This commit is contained in:
Jonas Schäfer 2019-02-04 16:37:17 +01:00
commit 9f1cd249ea
2 changed files with 9 additions and 6 deletions

View File

@ -23,12 +23,7 @@
<supersedes/> <supersedes/>
<supersededby/> <supersededby/>
<shortname>EME</shortname> <shortname>EME</shortname>
<author> &linkmauve;
<firstname>Emmanuel Gil</firstname>
<surname>Peyrot</surname>
<email>linkmauve@linkmauve.fr</email>
<jid>linkmauve@linkmauve.fr</jid>
</author>
<revision> <revision>
<version>0.2.0</version> <version>0.2.0</version>
<date>2018-01-25</date> <date>2018-01-25</date>

View File

@ -1082,6 +1082,14 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
<jid>jonas@wielicki.name</jid> <jid>jonas@wielicki.name</jid>
</author> </author>
" > " >
<!ENTITY linkmauve "
<author>
<firstname>Emmanuel Gil</firstname>
<surname>Peyrot</surname>
<email>linkmauve@linkmauve.fr</email>
<jid>linkmauve@linkmauve.fr</jid>
</author>
" >
<!-- XMPP Extension Protocols --> <!-- XMPP Extension Protocols -->