Merge branch 'dev' into 'testing'
# Conflicts: # .gitlab-ci.yml # ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml # ckanext-theme_hft/ckanext/theme_hft/templates/base.html # ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
Pipeline
#3393
passed
with stage
in
15 seconds