Commit 1ce01ab2 authored by Bob Harold's avatar Bob Harold
Browse files

Merge branch 'master' into 'dev'

# Conflicts:
#   .gitlab-ci.yml
#   .pylintrc
#   src/bluecat_bam/api.py
parents 6f7cc45b 58298bd7
Pipeline #58810 passed with stages
in 1 minute and 3 seconds