mirror of
https://github.com/moparisthebest/xeps
synced 2024-12-12 02:42:16 -05:00
XEP-0060: Merge revision blocks for this release, fix broken merge
This commit is contained in:
parent
3a3f57d945
commit
e2cefcfbe6
13
xep-0060.xml
13
xep-0060.xml
@ -52,9 +52,10 @@
|
|||||||
<revision>
|
<revision>
|
||||||
<version>1.15.6</version>
|
<version>1.15.6</version>
|
||||||
<date>2018-11-22</date>
|
<date>2018-11-22</date>
|
||||||
<initials>egp</initials>
|
<initials>jsc (Editor)</initials>
|
||||||
<remark>
|
<remark>
|
||||||
<p>Remove unused and never defined 'node' attribute in pubsub#event item schema. This had been added in version 1.8 of the JEP, but never used.</p>
|
<ul><li>Correct several "entity element(s)" to "<subscription/> element(s)" (mw)</li>
|
||||||
|
<li>Remove unused and never defined 'node' attribute in pubsub#event item schema. This had been added in version 1.8 of the JEP, but never used. (egp)</li></ul>
|
||||||
</remark>
|
</remark>
|
||||||
</revision>
|
</revision>
|
||||||
<revision>
|
<revision>
|
||||||
@ -77,14 +78,6 @@
|
|||||||
<p>Add a new sentence and example about what to do if there are fewer items than requested present in a node.</p>
|
<p>Add a new sentence and example about what to do if there are fewer items than requested present in a node.</p>
|
||||||
</remark>
|
</remark>
|
||||||
</revision>
|
</revision>
|
||||||
<revision>
|
|
||||||
<version>1.15.3</version>
|
|
||||||
<date>2018-08-02</date>
|
|
||||||
<initials>mv</initials>
|
|
||||||
<remark>
|
|
||||||
<p>Correct several "entity element(s)" to "<subscription/> element(s)"</p>
|
|
||||||
</remark>
|
|
||||||
</revision>
|
|
||||||
<revision>
|
<revision>
|
||||||
<version>1.15.2</version>
|
<version>1.15.2</version>
|
||||||
<date>2018-05-14</date>
|
<date>2018-05-14</date>
|
||||||
|
Loading…
Reference in New Issue
Block a user