Henry Jameson 913e513097 Merge remote-tracking branch 'upstream/develop' into shigusegubu ... * upstream/develop: add emoji reactions to changelog fix emoji reaction classes broken in develop review changes Fix password and email update remove unnecessary anonymous function Apply suggestion to src/services/api/api.service.js remove logs/commented code remove favs count from react button remove mock data change emoji reactions to use new format clean up code, fix prediction bug usable-but-buggy: picker, adding/removing reaction on click, search, styles wip commit, add basic popover for emoji reaction select add fetching for emoji reactions, draft design		2020-01-28 20:44:32 +02:00
..
conversation.js	Merge remote-tracking branch 'upstream/develop' into shigusegubu	2020-01-28 20:44:32 +02:00
conversation.vue	fix warnings and console errors	2020-01-15 18:41:38 +02:00