Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger ... Conflicts: specification/application_service_api.rst		2015-10-21 09:55:53 +01:00
..
templates	Add invite_room_state to spec. Flesh out info.	2015-10-16 16:43:33 +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 appservice-swagger	2015-10-21 09:55:53 +01:00