Skip to content
Snippets Groups Projects
  • Jesper Zedlitz's avatar
    998bf92d
    Merge branch 'master' into 'dev' · 998bf92d
    Jesper Zedlitz authored
    # Conflicts:
    #   ckanext/odsh/collection/controller.py
    #   ckanext/odsh/collection/helpers.py
    #   ckanext/odsh/controller.py
    #   ckanext/odsh/helpers_tpsh.py
    #   ckanext/odsh/plugin.py
    #   ckanext/odsh/profiles/odsh_dcat_de_profile.py
    #   ckanext/odsh/public/odsh.css
    #   ckanext/odsh/templates/user/login.html
    #   ckanext/odsh/validation.py
    998bf92d
    History
    Merge branch 'master' into 'dev'
    Jesper Zedlitz authored
    # Conflicts:
    #   ckanext/odsh/collection/controller.py
    #   ckanext/odsh/collection/helpers.py
    #   ckanext/odsh/controller.py
    #   ckanext/odsh/helpers_tpsh.py
    #   ckanext/odsh/plugin.py
    #   ckanext/odsh/profiles/odsh_dcat_de_profile.py
    #   ckanext/odsh/public/odsh.css
    #   ckanext/odsh/templates/user/login.html
    #   ckanext/odsh/validation.py