Skip to content
Snippets Groups Projects
Commit 7cdc34c4 authored by Fabian Nuraddin Alexander Gabel's avatar Fabian Nuraddin Alexander Gabel :speech_balloon:
Browse files

Merge branch 'fix-conflict' into 'master' 

Fix conflict

See merge request !71
parents 9a1330f2 dbecd3f8
No related branches found
No related tags found
2 merge requests!76Master,!71Fix conflict
Pipeline #105189 passed
Stage: testing
    Stage: build
      Stage: review
        Stage: deploy
          Hide whitespace changes
          Inline Side-by-side
          Showing
          with 592 additions and 61 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