Richard van der Hoff 34ac544290 Merge branch 'master' into rav/rework_objects ... Conflicts: templating/matrix_templates/units.py		2015-11-17 11:43:12 +00:00
..
templates	Moar spaces	2015-11-16 15:08:37 +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	Add instant_messaging module; modify batesian section rules	2015-09-23 10:48:49 +01:00
units.py	Merge branch 'master' into rav/rework_objects	2015-11-17 11:43:12 +00:00