HJ 84ebae8ed3 Merge branch 'develop' into 'themes-accent' ... # Conflicts: # src/components/emoji_reactions/emoji_reactions.vue		2020-02-11 23:09:15 +00:00
..
assets	Use an existing image served by backend instead	2019-02-03 13:30:54 -05:00
boot	Merge remote-tracking branch 'upstream/develop' into themes-accent	2020-01-28 20:44:13 +02:00
components	Merge branch 'develop' into 'themes-accent'	2020-02-11 23:09:15 +00:00
directives	refactor using Set	2019-10-21 20:57:36 -04:00
hocs	must use h in higher babel-plugin-transform-vue-jsx	2019-12-12 12:13:31 +05:00
i18n	Merge branch 'develop' into 'themes-accent'	2020-02-11 23:09:15 +00:00
lib	Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)	2020-01-24 00:55:13 +03:00
modules	Merge branch 'develop' into 'themes-accent'	2020-02-11 23:09:15 +00:00
services	Merge branch 'develop' into 'themes-accent'	2020-02-11 23:09:15 +00:00
_variables.scss	Emoji Reactions - fixes and improvements	2020-02-11 12:24:51 +00:00
App.js	Merge branch 'develop' into feature/lockdown-timelines-private-mode	2019-12-12 13:32:52 -06:00
App.scss	Merge branch 'develop' into 'themes-accent'	2020-02-11 23:09:15 +00:00
App.vue	updated preview to account for underlay	2020-01-28 23:45:14 +02:00
main.js	Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)	2020-01-24 00:55:13 +03:00
sw.js	add checkbox to disable web push	2018-12-13 00:03:50 +07:00