Daniel Wagner-Hall 2734f9f9f2 Merge branch 'master' into daniel/multipleexamples ... Conflicts: specification/modules/third_party_invites.rst		2015-11-05 18:33:31 +00:00
..
templates	Merge branch 'master' into daniel/multipleexamples	2015-11-05 18:33:31 +00:00
__init__.py	Completely split up the templating system from the Matrix Spec template code.	2015-05-26 16:20:15 +01:00
sections.py	Show multiple examples where present	2015-10-28 15:00:53 +00:00
units.py	Merge branch 'master' into daniel/multipleexamples	2015-11-05 18:33:31 +00:00