Skip to content
Snippets Groups Projects
Commit 03e56b78 authored by Ulf Seltmann's avatar Ulf Seltmann
Browse files

Merge branch 'master' into 'add_gitlab_ci'

# Conflicts:
#   .gitlab-ci.yml
#   package.json
parents 46ff25f8 ac1cb9fb
1 merge request!2adds gitlab ci
Pipeline #13 passed with stages
in 1 minute and 29 seconds