mirror of
https://github.com/zadam/trilium.git
synced 2024-12-26 01:01:26 +08:00
9e9fb2979f
# 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 |
||
---|---|---|
.. | ||
codeStyles | ||
inspectionProfiles | ||
jsLinters | ||
.gitignore | ||
dataSources.xml | ||
encodings.xml | ||
git_toolbox_prj.xml | ||
jsLibraryMappings.xml | ||
misc.xml | ||
modules.xml | ||
sqldialects.xml | ||
vcs.xml |