Merge branch 'v8/8.15' into v8/8.16

# Conflicts: # src/Umbraco.Web.UI.Client/src/less/property-editors.less
2021-08-23 11:03:45 +02:00
parent 4c0cdbd615 c72cb1683b
commit 0f3e2cfd02
1 changed files with 0 additions and 1 deletions
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -585,7 +585,6 @@
    display: inline-block;
    position: relative;
    vertical-align: top;
-    flex:0;
 }

 .umb-fileupload,