yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8c2329f2b20a6227f586973d32349321c4e81529
Umbraco-CMS/src/Umbraco.Cms.StaticAssets
History
Sebastiaan Janssen 8c2329f2b2 Merge branch 'v11/dev' into v11/contrib 
# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html
2022-11-28 13:50:44 +01:00
..
umbraco
A11Y added missing iframe title to installer and preview controller.
2022-10-25 15:40:14 +02:00
wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews
Display media trashed state on custom view for image demo block (#13448)
2022-11-22 09:43:45 +01:00
Umbraco.Cms.StaticAssets.csproj
Fix ManagementApi dependency and update JSON schema file names
2022-10-12 10:47:10 +02:00