Skip to content
Snippets Groups Projects
Commit 54e9e190 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' into... 

Merge branch 'master' into '790-iframe-height-is-sometimes-not-set-updated-correctly-in-legacybasetemplate'

# Conflicts:
#   CHANGELOG.rst
parents cf0b18fa 1745ae0c
No related branches found
No related tags found
1 merge request!1160Resolve "IFrame height is sometimes not set/updated correctly in LegacyBaseTemplate"
Pipeline #110305 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 410 additions and 66 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment