Skip to content
Snippets Groups Projects
Dominik George's avatar
Nik | Klampfradler authored
Merge branch 'master' into '790-iframe-height-is-sometimes-not-set-updated-correctly-in-legacybasetemplate'

# Conflicts:
#   CHANGELOG.rst
54e9e190
History
Name Last commit Last update