Skip to content
Snippets Groups Projects
Commit 74446b2a authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'master_sock' into 'dev' 

Master sock

See merge request !46
parents 580c42df 53789073
No related branches found
No related tags found
4 merge requests!77Revert "disable agressive kill and restart",!48Test,!47Dev,!46Master sock
Pipeline #12192 passed
Stage: build
    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