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

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
#	kicker.json
parents 8a0d56b7 71e8dc76
Branches
Tags
No related merge requests found
Pipeline #169990 passed