amedora 2c0e0a6e39 Merge branch 'master' into filter-tags-and-folders ...

# Conflicts:
#	browser/main/SideNav/index.js

2020-02-05 11:13:28 +09:00

..

components

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

2020-02-05 11:13:28 +09:00

finder

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

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

lib

fixed eslint error & integrated with prettier as well as formatted the whole codebase (#3450)

2020-02-05 09:28:27 +09:00

main

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

2020-02-05 11:13:28 +09:00

styles

Merge branch 'master' into theme-nord

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