Elisabeth Kulzer 57719d7dcc Resolved conflicts.		2020-06-27 10:36:08 +02:00
..
base	Resolved conflicts.	2020-06-27 10:36:08 +02:00
fonts	[MM-18362] Sidebar improvements (#3223)	2019-09-16 13:17:48 -03:00