zadam 9e9fb2979f Merge branch 'master' into next61 ...

# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js

2023-05-20 20:55:57 +02:00

..

app

Merge branch 'master' into next61

2023-05-20 20:55:57 +02:00

fonts

added missing font files #3933

2023-05-13 16:29:18 +02:00

stylesheets

Merge branch 'master' into next61

2023-05-20 20:55:57 +02:00

manifest.webmanifest

use trilium version number in asset paths to avoid caching issues

2022-10-27 20:34:53 +02:00

robots.txt

add allow robots.txt tag for /share

2022-03-22 21:02:32 +01:00