zadam c16f7a5e02 Merge branch 'master' into next55 ... # Conflicts: # electron.js # package-lock.json # package.json # src/public/app/layouts/desktop_layout.js # src/public/app/widgets/note_tree.js # src/services/port.js		2022-10-15 12:09:25 +02:00
..
becca	FIXME comment on virtual branches	2022-09-24 23:03:38 +02:00
etapi	Merge branch 'master' into next55	2022-10-15 12:09:25 +02:00
public	Merge branch 'master' into next55	2022-10-15 12:09:25 +02:00
routes	Merge branch 'master' into next55	2022-10-15 12:09:25 +02:00
services	Merge branch 'master' into next55	2022-10-15 12:09:25 +02:00
share	fix password protected notes rejection	2022-08-01 19:56:09 +02:00
tools	allow cloning into notes, not just branches, fixes #2484	2021-12-27 23:39:46 +01:00
views	Add shareDescription	2022-08-17 15:18:34 -04:00
anonymize.js
app.js	disable compression for electron / desktop builds	2022-08-22 19:29:58 +02:00
www	fix electron	2022-09-04 14:01:34 +02:00