Elisabeth Kulzer 57719d7dcc Resolved conflicts.		2020-06-27 10:36:08 +02:00
..
i18n	Resolved conflicts.	2020-06-27 10:36:08 +02:00
images	MM-14038 Access recent reactions from the long press menu (#4058)	2020-04-01 12:56:49 -07:00
release	Android release launch screen (#3609)	2019-11-26 23:39:34 -05:00
config.json	MM-23570 Migrate from Segment to Rudder (#4293)	2020-05-13 16:54:07 -04:00
mattermost-fonts.json	[MM-18362] Sidebar improvements (#3223)	2019-09-16 13:17:48 -03:00