From de6e762b544906118af8b5d74c1d0ba76f40c6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Fri, 22 Sep 2017 08:52:11 +0200
Subject: [PATCH] Update Moxl and CHANGELOG

---
 CHANGELOG.md  |  1 +
 composer.json |  2 +-
 composer.lock | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf171ecdf..4e9cbf8f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ v0.12 (trunk)
  * More colors!
  * Protect pictures URLs with a HTTP HEAD check
  * Add Miho sticker pack
+ * Add support of MAM (up to mam:2) for the MUCs
 
 v0.11
 ---------------------------
diff --git a/composer.json b/composer.json
index bbb79b85c..c427c2f56 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 
         "movim/modl": "dev-master#03c6f6e0c83b494ba33df318a724caf779cd37a8",
         "movim/sasl2": "dev-master",
-        "movim/moxl": "dev-master#0dc5c023e74898cf11471e1275c0e7821f161320",
+        "movim/moxl": "dev-master#2edef2af59306e62ecc0267e95505ec37fb5e91e",
 
         "embed/embed": "dev-master",
         "heyupdate/emoji": "dev-twemoji2#99dda1bed08472046cac1498221f08684ad83d55",
diff --git a/composer.lock b/composer.lock
index 351cf813b..5a3289e9d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "37f96cc0de0a0bb2d95392a5c01d6522",
+    "content-hash": "6c9d66413d8665c92d806cb34eb56672",
     "packages": [
         {
             "name": "cboden/ratchet",
@@ -778,12 +778,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/movim/moxl.git",
-                "reference": "0dc5c023e74898cf11471e1275c0e7821f161320"
+                "reference": "2edef2af59306e62ecc0267e95505ec37fb5e91e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/movim/moxl/zipball/0dc5c023e74898cf11471e1275c0e7821f161320",
-                "reference": "0dc5c023e74898cf11471e1275c0e7821f161320",
+                "url": "https://api.github.com/repos/movim/moxl/zipball/2edef2af59306e62ecc0267e95505ec37fb5e91e",
+                "reference": "2edef2af59306e62ecc0267e95505ec37fb5e91e",
                 "shasum": ""
             },
             "require": {
@@ -818,7 +818,7 @@
                 "php",
                 "xmpp"
             ],
-            "time": "2017-09-21 21:10:04"
+            "time": "2017-09-22 06:50:28"
         },
         {
             "name": "movim/sasl2",