Merge branch 'refs/heads/1.10.x' into dev

# Conflicts: # src/Orchard/Data/Migration/AutomaticDataMigrations.cs
2025-10-26 20:16:15 +08:00 · 2016-10-17 14:40:54 -07:00
parent ca9fb77d8a 59a9f0bf03
commit 5c430ef7d1
2 changed files with 4 additions and 2 deletions
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Handlers/ShapeTracingSiteSettingsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Handlers/ShapeTracingSiteSettingsPartHandler.cs
@@ -28,7 +28,6 @@ namespace Orchard.DesignerTools.Handlers {
            base.GetItemMetadata(context);

            var groupInfo = new GroupInfo(T("Shape Tracing"));
-            groupInfo.Id = "ShapeTracing";

            context.Metadata.EditorGroupInfo.Add(groupInfo);
        }