mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-01-18 19:51:45 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel>" %>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel>" %>
|
||||||
@@ -244,6 +244,8 @@
|
|||||||
<Content Include="Contents\Views\Item\Preview.aspx" />
|
<Content Include="Contents\Views\Item\Preview.aspx" />
|
||||||
<Content Include="Contents\Views\Item\Display.aspx" />
|
<Content Include="Contents\Views\Item\Display.aspx" />
|
||||||
<Content Include="Localization\Styles\admin.css" />
|
<Content Include="Localization\Styles\admin.css" />
|
||||||
|
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.Summary.ascx" />
|
||||||
|
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.ascx" />
|
||||||
<Content Include="Localization\Views\EditorTemplates\Parts\Localization.ContentTranslations.ascx" />
|
<Content Include="Localization\Views\EditorTemplates\Parts\Localization.ContentTranslations.ascx" />
|
||||||
<Content Include="Reports\Module.txt" />
|
<Content Include="Reports\Module.txt" />
|
||||||
<Content Include="Reports\Views\Admin\Display.aspx" />
|
<Content Include="Reports\Views\Admin\Display.aspx" />
|
||||||
|
|||||||
Reference in New Issue
Block a user