Skip to content
Snippets Groups Projects
Commit 8ac3f588 authored by Julian's avatar Julian
Browse files

Merge branch 'master' into manage-holidays 

# Conflicts:
#	CHANGELOG.rst
parents dc34ad4a 95971d91
No related branches found
No related tags found
1 merge request!1261Manage holidays
Pipeline #134956 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Hide whitespace changes
Inline Side-by-side
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