Skip to content
Snippets Groups Projects
Commit 7e4b7559 authored by Carsten Rose's avatar Carsten Rose
Browse files

Merge branch 'develop' into ipa_haller_jan 

# Conflicts:
#	extension/Classes/Sql/function.sql
#	extension/Classes/Sql/qfqDefaultTables.sql
#	extension/Tests/Unit/Core/Database/DatabaseUpdateTest.php
#	less/qfq-bs.css.less
parents a33c86e3 8e083b89
No related branches found
No related tags found
2 merge requests!691New version v24.3.0,!607ipa_haller_jan: QFQ-Wiki. refs #15634
Pipeline #11740 failed
Stage: build
Stage: test
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1566 additions and 736 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