Skip to content
Snippets Groups Projects
Commit 7f18103c authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 'fix-dialog-object-forms-internal-dialog-mode-handling'

# Conflicts:
#   CHANGELOG.rst
#   aleksis/core/frontend/components/generic/dialogs/DialogObjectForm.vue
parents 00db3b30 95a0c650
No related branches found
No related tags found
1 merge request!1793Fix dialog-Object-Form's internal dialog-mode-handling
Pipeline #197733 passed with warnings