From 434e2949f919cd909e8ac93c01f4b015c7d19a1f Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Wed, 23 May 2018 17:00:26 +0100
Subject: [PATCH] include #1256

---
 specification/proposals.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/specification/proposals.rst b/specification/proposals.rst
index d36b93dc..7872f6bd 100644
--- a/specification/proposals.rst
+++ b/specification/proposals.rst
@@ -185,6 +185,14 @@ proposal-wip
      - `@neilisfragile`_
      - None
      - 
+   * - `MSC1256 <https://github.com/matrix-org/matrix-doc/issues/1256>`_
+     - Custom emoji and sticker packs in matrix
+     - 2018-05-23
+     - 2018-05-23
+     - `1256-1 <https://docs.google.com/document/d/1zHS14unA2Wb3DgTL5fiymlWKZo4WMJpmmJOgY_2g6pg/edit?usp=sharing>`_
+     - `@turt2live`_
+     - None
+     -