Skip to content
Snippets Groups Projects
Commit 89db31d9 authored by Elias Villiger's avatar Elias Villiger
Browse files

Merge branch 'develop' into 'F17393-fe-report-editor-qfq-syntax-highlighting' 

# Conflicts:
#   javascript/build/terser.js
#   javascript/src/Helper/codemirror.js
parents 843d881d 773b666d
No related branches found
No related tags found
2 merge requests!691New version v24.3.0,!663F17393 fe report editor qfq syntax highlighting
Pipeline #11880 passed
Stage: build
Stage: test
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1131 additions and 216 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment