HJ 84ebae8ed3 Merge branch 'develop' into 'themes-accent' ... # Conflicts: # src/components/emoji_reactions/emoji_reactions.vue		2020-02-11 23:09:15 +00:00
..
settings.js	Some error handling	2019-12-26 14:12:35 +02:00
settings.vue	Merge branch 'develop' into 'themes-accent'	2020-02-11 23:09:15 +00:00