svetlana maleeva 7c98469ca1 Merge branch 'feature/jira' into hotfix/1.2.1 ... # Conflicts: # Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx # Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx # Web/Controls/Help/Tags/docker-version/docker-version.ascx # Web/Controls/Help/Tags/document-server/document-server.ascx # Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx # Web/Controls/Help/Tags/linux-version/linux-version.ascx # Web/Controls/Help/Tags/local-server/local-server.ascx # Web/Controls/Help/Tags/open-source-version/open-source-version.ascx # Web/css/help.less		2021-12-02 11:50:57 +03:00
..
IntegrationMenu.ascx	Merge branch 'feature/jira' into hotfix/1.2.1	2021-12-02 11:50:57 +03:00