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

Merge branch 'master' into 'pages' 

# Conflicts:
#   .gitlab-ci.yml
parents 692b820b 76b6dfbd
No related branches found
No related tags found
1 merge request!1Update .gitlab-ci.yml
Pipeline #28021 canceled
Stage: deploy
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 1 addition and 1 deletion
    .gitlab-ci.yml
    + 1
    − 1
    View file @ a23bd3ad
    ......@@ -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