Mark Haines 7ac5c3766c Merge remote-tracking branch 'origin/master' into markjh/event-schema ... Conflicts: templating/matrix_templates/units.py		2015-09-18 15:49:36 +01:00
..
templates	Add ability to refer to aliases of endpoints	2015-09-08 16:27:20 +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	s/registration/login/	2015-09-14 17:10:46 +01:00
units.py	Merge remote-tracking branch 'origin/master' into markjh/event-schema	2015-09-18 15:49:36 +01:00