Commit 9eaff3f4 authored by Gandalf's avatar Gandalf
Browse files

Merge branch 'develop-revert-cleanup' into 'develop' 

Revert changes from recent commits in develop to clean history and keep only iframe crash fix

See merge request !430
parents e7cfcf5b 90eb988c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment