Merge branch 'feature/flatpak-title' into release/1.5.0

This commit is contained in:
Svetlana Maleeva 2022-05-31 14:12:44 +03:00
commit 6549c1a80d

View File

@ -1,6 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationDesktopArticles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<%@ Register TagPrefix="DeskLinInstFp" TagName="DeskLinInstFp" Src="~/Controls/Help/Desktop/Documents/Linux/DeskLinInstFp.ascx" %>
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
<body class="desktop_linux_version desktop_editors installation_desktop">
</asp:Content>
@ -8,7 +7,7 @@
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DesktopDocumentsTop/DesktopDocumentsTop.ascx" />
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
<DeskLinInstFp:DeskLinInstFp ID="DeskLinInstFp1" runat="server" />
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Desktop/Documents/Linux/DeskLinInstFp.ascx" />
</asp:Content>
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
<div class="guidespage document">