David Baker 590d6d3ee8 Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms		2016-09-09 16:22:48 +01:00
..
structures	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-07 17:22:10 +01:00
views	Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms	2016-09-09 16:22:48 +01:00