Skip to content
Snippets Groups Projects
Commit 758c0c1e authored by Mark's avatar Mark
Browse files

Resolve merge conflicts 

# Conflicts:
#   .gitlab-ci.yml
parents eda77508 797c5953
No related branches found
No related tags found
1 merge request!2Login and logout
Pipeline #239 passed with stages
Stage:
    Stage:
      in 3 minutes and 49 seconds