Luke Barnard bd106968ce Merge branch 'develop' into luke/fix-join-part-collapsing-causality ...

Conflicts:
	src/components/structures/MessagePanel.js

2017-01-24 14:22:18 +00:00

..

dialogs

InteractiveAuthDialog

2016-10-12 08:23:28 +01:00

elements

Remove done, const instead of var for requiers

2017-01-18 12:03:38 +01:00

rooms

Add markdown test-cases

2017-01-18 20:54:34 +01:00