Bruno Windels 106c91aec0 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux' ...

# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss

2020-07-14 09:26:04 +00:00

..

structures

Merge remote-tracking branch 'origin/develop' into element

2020-07-14 10:17:43 +01:00

views

Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'

2020-07-14 09:26:04 +00:00