zadam 634baae796 Merge remote-tracking branch 'origin/stable' ... # Conflicts: # src/services/build.js		2021-04-19 20:56:56 +02:00
..
codeStyles	electron update	2020-11-10 22:54:03 +01:00
inspectionProfiles	collapse/expand only folder notes	2020-05-03 09:49:56 +02:00
jsLinters	WIP refactoring of data structures in note tree	2018-03-24 20:41:27 -04:00
.gitignore	more robust handling of sync error, fixes #830	2020-01-18 08:48:36 +01:00
dataSources.xml	hide body during startup to reduce flicker	2020-05-21 09:42:25 +02:00
encodings.xml	relation map WIP	2018-10-25 12:06:36 +02:00
jsLibraryMappings.xml	idea config stuff	2021-04-13 21:54:34 +02:00
misc.xml	idea config stuff	2021-04-13 21:54:34 +02:00
modules.xml	removed some warnings in idea	2018-03-24 12:52:58 -04:00
sqldialects.xml	idea config stuff	2021-04-13 21:54:34 +02:00
vcs.xml	use official gh client instead of github-release to execute releases	2021-04-18 21:29:10 +02:00