Skip to content
Commit 22a5a3a7 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'antechrestos-master-patch-04100' into 'master' 

Prevent replacement when specified

Closes #19

See merge request to-be-continuous/kubernetes!24
parents d4410d28 24fa8674
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