Kegan Dougal 09ac367847 Merge branch 'master' into module-content-repo ... Conflicts: templating/matrix_templates/units.py		2015-10-02 10:46:46 +01:00
..
templates	Flesh out content repo; modify templating to support headers	2015-10-01 17:55:16 +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 module-content-repo	2015-10-02 10:46:46 +01:00