Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml		2015-10-12 18:11:01 +01:00
..
templates	Wrap correctly	2015-10-08 16:38:41 +01: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	Add instant_messaging module; modify batesian section rules	2015-09-23 10:48:49 +01:00
units.py	Merge branch 'master' into daniel/threepidinvites-2	2015-10-12 18:11:01 +01:00