Commit b5c540a1 authored by Adam Parák's avatar Adam Parák 💬
Browse files

Merge branch 'master' into 'eslint-improvements' 

# Conflicts:
#   src/logic/SidebarList/index.tsx
parents 2344dd10 cd345f96
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment