Skip to content
Snippets Groups Projects
Commit bb6b95f8 authored by Hannes Toräng's avatar Hannes Toräng
Browse files

Merge branch 'master' into 'CI_elleg597' 

# Conflicts:
#   .gitlab-ci.yml
parents fc7597f3 b7234401
No related branches found
No related tags found
1 merge request!2Ci elleg597
Pipeline #53193 passed with warnings
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.gitlab-ci.yml
+ 1
− 0
View file @ bb6b95f8
......@@ -29,6 +29,7 @@ pages:
paths:
- public
# vi: ts=2 sw=2 et tw=80 cc=+1 new changes :)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment