Commit 9f8cc187 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

Merge branch 'dev' into 'testing'

# Conflicts:
#   ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
#   ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
2 merge requests!11Testing,!8Testing
Pipeline #3656 passed with stage
in 14 seconds