include #1256

6 years ago · 434e2949f9
parent 8d550d2166
commit 434e2949f9
1 changed files with 8 additions and 0 deletions
--- 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
+     -