Merge remote-tracking branch 'origin/master' into markjh/event-schema

Conflicts: templating/matrix_templates/units.py
2015-09-18 15:49:36 +01:00 · 2015-09-18 15:49:36 +01:00 · 7ac5c3766c
commit 7ac5c3766c
parent 1540b1fe3c a2cfb89086
21 changed files with 250 additions and 197 deletions
--- a/templating/matrix_templates/units.py
+++ b/templating/matrix_templates/units.py
@ -409,7 +409,6 @@ class MatrixUnits(Units):
                        "`m.room.message msgtypes`_."
                    )

-
                # Assign state key info if it has some
                if schema["typeof"] == "State Event":
                    skey_desc = Units.prop(