Commit 3455a9b5 authored by Mark Stenglein's avatar Mark Stenglein
Browse files

Merge branch 'develop' into '4-start-anew'

# Conflicts:
#   .gitlab-ci.yml
parents 6d80477a 139552cb
Pipeline #930 passed with stage
in 16 seconds
......@@ -13,4 +13,4 @@ test_lib-ical:
- npm install
- npm install -g typescript ts-node gulp-cli
- npm test
- npm test
\ No newline at end of file
Markdown is supported
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