Skip to content
Snippets Groups Projects
Commit 3df2cd8f authored by Lucas Sulzbach's avatar Lucas Sulzbach
Browse files

Merge branch 'develop' into 'issue/534' 

# Conflicts:
#   package/le-control-panel
parents 72d8206e c45e21c7
No related branches found
No related tags found
2 merge requests!11Deploying for testing.,!8SCRUM#534: Add feature to enable/disable epoptes
Pipeline #16285 passed
Stage: lint
    Stage: build
      Stage: test
        Hide whitespace changes
        Inline Side-by-side
        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