Skip to content
Snippets Groups Projects
Commit 980a4fd7 authored by Dave Casper's avatar Dave Casper
Browse files

Merge branch 'master' into 'master' 

Conform with ATLAS changes

See merge request faser/calypso!36
parents 9f4ac684 5a7fdc02
No related branches found
No related tags found
1 merge request!36Conform with ATLAS changes
Pipeline #1233675 passed
Stage: build
    Stage: test
      Hide whitespace changes
      Inline Side-by-side
      Showing
      with 10 additions and 42 deletions
      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