Skip to content
Snippets Groups Projects
Commit 97da85be authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'master' into 'set-software-se-as-sync-target' 

# Conflicts:
#   hooks/templates/inc_projects_config.php.erb
parents 27121f79 750b6d73
No related branches found
No related tags found
1 merge request!6add se server
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment