Bruno Windels b6a5fa38e1 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux' ... # Conflicts: # res/css/views/rooms/_RoomSublist2.scss		2020-07-14 12:40:52 +00:00
..
structures	Merge branch 'develop' into element	2020-07-14 14:31:31 +02:00
views	Merge branch 'develop' into element	2020-07-14 14:31:31 +02:00