Skip to content
Snippets Groups Projects
Commit c21364a4 authored by K8573's avatar K8573
Browse files

Merge branch 'master' into 'pages' 

# Conflicts:
#   .gitlab-ci.yml
parents 2110eb26 2fcef635
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitlab-ci.yml
+ 1
− 1
View file @ c21364a4
......@@ -10,4 +10,4 @@ pages:
paths:
- public
only:
- master
- pages
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