Shpuld Shpludson f31bc5310e Merge branch 'master' into 'rc/2.1.1' ... # Conflicts: # CHANGELOG.md		2020-09-08 09:35:36 +00:00
..
assets	Use an existing image served by backend instead	2019-02-03 13:30:54 -05:00
boot	Merge branch 'direct-conversations' into 'develop'	2020-07-10 09:04:45 +00:00
components	Merge branch 'fix/locked-account-link-fix' into 'develop'	2020-09-04 08:11:31 +00:00
directives	refactor using Set	2019-10-21 20:57:36 -04:00
hocs	Add Chats	2020-07-08 15:21:31 +03:00
i18n	Translated using Weblate (Basque)	2020-09-07 08:01:49 +00:00
lib	Linting + docs	2020-06-13 11:53:16 +02:00
modules	Add hacky functionality to open specific settings tabs	2020-09-03 15:45:13 +03:00
services	Merge branch 'master' into 'rc/2.1.1'	2020-09-08 09:35:36 +00:00
App.js	Address feedback	2020-07-08 15:21:31 +03:00
App.scss	Use bock-scroll-lock directive for the settings modal	2020-07-23 12:15:44 +03:00
App.vue	Address feedback	2020-07-08 15:21:31 +03:00
_variables.scss	Add Chats	2020-07-08 15:21:31 +03:00
main.js	Add Chats	2020-07-08 15:21:31 +03:00
sw.js	ServiceWorker: Use clearer variable names	2020-06-19 15:24:06 +02:00