zadam 7494491560 Merge remote-tracking branch 'origin/master' into next ...

# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js

2021-04-25 11:14:45 +02:00

..

api

Merge remote-tracking branch 'origin/master' into next

2021-04-25 11:14:45 +02:00

custom.js

fix wrong behavior when customResourceProvider has empty value, fixes #1393

2020-11-06 21:52:57 +01:00

electron.js

fixed "duplicate subtree"

2021-02-14 11:43:31 +01:00

index.js

sync status widget

2021-03-21 22:43:41 +01:00

login.js

log warning about unsucessful login

2021-04-19 21:41:29 +02:00

routes.js

opened file change detection now useable on all note types

2021-04-24 21:56:44 +02:00

setup.js

syncification

2020-06-20 12:31:38 +02:00