Commit c8486f18 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

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
parents ee21bb51 d24e8e7c
Pipeline #3393 passed with stage
in 15 seconds