Merge remote-tracking branch 'origin/main' into fix-dev-main-merge-is… · jplag/JPlag@7e15a99 · GitHub

Commit

Merge remote-tracking branch 'origin/main' into fix-dev-main-merge-is…

Browse files

…sues

# Conflicts:
#	report-viewer/src/components/fileDisplaying/CodePanel.vue
#	report-viewer/src/components/fileDisplaying/FilesContainer.vue

Loading branch information

Kr0nox committed Oct 21, 2024

2 parents e9333d7 + 3fb0b8f commit 7e15a99