Skip to content
Snippets Groups Projects
Commit e6e0a298 authored by Henry Fröcklin's avatar Henry Fröcklin
Browse files

Merge branch 'devel' into 'production'

Devel

See merge request !9
parents 85428903 b7dfff69
No related branches found
No related tags found
2 merge requests!15Revert "fix more name conflicts",!9Devel
Pipeline #139127 passed