Skip to content
Snippets Groups Projects
Commit fa3047da authored by Benguria Elguezabal, Gorka's avatar Benguria Elguezabal, Gorka
Browse files

Merge remote-tracking branch 'upstream/master' 

# Conflicts:
#	.gitlab-ci.yml
#	CHANGELOG.md
#	README.md
#	kicker.json
#	templates/gitlab-ci-renovate.yml
parents 893276a8 39ff8e2d
Branches
Tags 1.2 1.2.2
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment