Shpuld Shpludson c7ddfefe34 Merge branch 'master' into '2.1.0-rc0' ... # Conflicts: # CHANGELOG.md # src/services/api/api.service.js		2020-08-27 13:59:56 +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	fix long poll labels overflowing	2020-08-25 12:17:42 +03: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 (Italian)	2020-08-19 12:00:19 +00:00
lib	Linting + docs	2020-06-13 11:53:16 +02:00
modules	Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop'	2020-08-06 10:17:44 +00:00
services	Merge branch 'master' into '2.1.0-rc0'	2020-08-27 13:59:56 +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