Skip to content
Snippets Groups Projects
Commit 13ad5257 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'stable' into feature/8740-new-signing-key-phase-2 

Conflicts:
	features/step_definitions/checks.rb
parents 0550b1cd ff9063e7
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