zadam 9ba514d930 Merge remote-tracking branch 'origin/stable' ... # Conflicts: # package-lock.json # trilium.iml		2021-04-18 12:39:19 +02:00
..
entities	added #runOnInstance and #runAtHour	2021-04-08 21:22:47 +02:00
public	show not set keyboard shortcuts as "not set", #1851	2021-04-15 21:45:37 +02:00
routes	Merge remote-tracking branch 'origin/stable'	2021-04-18 12:39:19 +02:00
services	release 0.47.0-beta	2021-04-11 22:29:56 +02:00
tools
views	show not set keyboard shortcuts as "not set", #1851	2021-04-15 21:45:37 +02:00
anonymize.js
app.js	fix partial syncs	2021-01-14 23:22:13 +01:00
www	fix config.ini Network host not work (#1546)	2021-01-18 17:46:48 +01:00