Shpuld Shpludson 91f93d4a55 Merge branch 'develop' into 'feat/timeline-quick-settings' ... # Conflicts: # CHANGELOG.md		2021-02-28 15:37:39 +00:00
..
popover.js	Merge branch 'develop' into 'feat/timeline-quick-settings'	2021-02-28 15:37:39 +00:00
popover.vue	fix vue warnings	2021-02-25 14:32:21 +02:00