amedora 725bf2a691 Merge branch 'master' into filter-tags-and-folders ...

# Conflicts:
#	browser/main/SideNav/PreferenceButton.styl
#	browser/main/SideNav/SideNav.styl

2020-02-05 09:07:13 +09:00

..

components

Merge branch 'master' into filter-tags-and-folders

2020-02-05 09:07:13 +09:00

finder

Merge branch 'master' into feat/display-url-title

2018-02-05 11:50:14 +02:00

lib

Merge branch 'master' into theme-nord

2020-01-30 19:14:58 +01:00

main

Merge branch 'master' into filter-tags-and-folders

2020-02-05 09:07:13 +09:00

styles

Merge branch 'master' into theme-nord

2020-01-30 19:14:58 +01:00