zadam 36eac6badd Merge remote-tracking branch 'origin/master' into m41 ... # Conflicts: # src/public/javascripts/mobile.js # src/public/stylesheets/style.css		2020-02-25 09:42:27 +01:00
..
codeStyles	options split into individual classes	2019-08-21 20:24:37 +02:00
dataSources	pane rename	2020-01-11 18:33:43 +01:00
inspectionProfiles	removed some warnings in idea	2018-03-24 12:52:58 -04: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	always autofix note_contents.content = NULL sync issue after note erasion	2020-02-19 19:51:36 +01:00
encodings.xml	relation map WIP	2018-10-25 12:06:36 +02:00
jsLibraryMappings.xml	small refactorings	2019-10-20 13:09:00 +02:00
misc.xml	WIP refactoring of data structures in note tree	2018-03-24 20:41:27 -04:00
modules.xml	removed some warnings in idea	2018-03-24 12:52:58 -04:00
sqldialects.xml	attributes can be inherited through special relation "inheritAttributes"	2018-08-13 17:05:16 +02:00
vcs.xml	removed some warnings in idea	2018-03-24 12:52:58 -04:00