Skip to content
Snippets Groups Projects
Commit d9f408a4 authored by Ezekiel Dohmen's avatar Ezekiel Dohmen
Browse files

Merge branch 'master-branch-4.2-merge' into 'master' 

Merge with branch 4.2

See merge request cds/advligorts!366
parents d1ad313b 8e0a14d2
No related branches found
No related tags found
2 merge requests!439RCG 5.0 release fro deb 10,!366Merge with branch 4.2
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2179 additions and 156 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