Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	package.json
#	src/services/build.js
This commit is contained in:
zadam
2021-12-31 20:16:31 +01:00
8 changed files with 5761 additions and 4 deletions

5734
libraries/codemirror/keymap/vim.js vendored Normal file

File diff suppressed because it is too large Load Diff