From 734d327ab0740a9c8ed826b62f9fec13f252e8b7 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sun, 28 Apr 2019 17:46:48 +0200
Subject: [PATCH] XEP-0380: Add OMEMO encryption method

---
 xep-0380.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/xep-0380.xml b/xep-0380.xml
index c5a811e4..e6ca897f 100644
--- a/xep-0380.xml
+++ b/xep-0380.xml
@@ -11,7 +11,7 @@
     recipient can discover how to decrypt it.</abstract>
   &LEGALNOTICE;
   <number>0380</number>
-  <status>Deferred</status>
+  <status>Experimental</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <approver>Council</approver>
@@ -24,6 +24,15 @@
   <supersededby/>
   <shortname>EME</shortname>
   &linkmauve;
+  <revision>
+    <version>0.3.0</version>
+    <date>2019-04-28</date>
+    <initials>lnj</initials>
+    <remark>
+      <p>Added OMEMO encryption namespace.</p>
+      <p>Made XEP experimental again.</p>
+    </remark>
+  </revision>
   <revision>
     <version>0.2.0</version>
     <date>2018-01-25</date>
@@ -168,11 +177,11 @@
       <td>urn:xmpp:openpgp:0</td>
       <td>&xep0373;</td>
     </tr>
-    <!--<tr>
+    <tr>
       <td>OMEMO</td>
-      <td>urn:xmpp:omemo:0</td>
-      <td>https://conversations.im/xeps/multi-end.html</td>
-    </tr>-->
+      <td>eu.siacs.conversations.axolotl</td>
+      <td>&xep0384;</td>
+    </tr>
   </table>
 </section2>