svetlana maleeva a102fff4fc Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release ... # Conflicts: # Web/Controls/Help/Tags/custom-domain-name/custom-domain-name.ascx # Web/Controls/Help/Tags/invite-people/invite-people.ascx # Web/Controls/Help/Tags/password-strength/password-strength.ascx # Web/Controls/Help/Tags/restore-backup/restore-backup.ascx # Web/Controls/Help/Tags/security/security.ascx # Web/Controls/Help/Tags/trusted-domains/trusted-domains.ascx		2022-03-18 13:30:18 +03:00
..
ABCIndex	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
Administration	Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release	2022-03-18 13:30:18 +03:00
AdministratorGuides	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
ArticlesCompleteList	Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release	2022-03-18 13:30:18 +03:00
Calendar	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
CloseContainer
Cloud
Community	Rename controls	2022-02-15 17:04:43 +03:00
CRM	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
Desktop/Documents	Edit Flatpak translations	2022-03-18 12:34:54 +03:00
Documents	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
FAQ	Update Developer Edition faq	2022-02-07 13:40:43 +03:00
GettingStarted	Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release	2022-03-18 13:30:18 +03:00
Glossary
Guides	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
Installation	Merge remote-tracking branch 'remotes/origin/feature/desktop_installation_guides' into feature/test-merge-for-release	2022-03-17 17:19:30 +03:00
Integration	Fix watchvideo_block for new Redmine video	2022-03-17 14:38:35 +03:00
Mail
MobApps	Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release	2022-03-17 13:10:38 +03:00
Modules_Settings	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
ONLYOFFICEEditors	Remove HideContents.ascx because of using Resource.resx instead.	2022-03-02 17:42:41 +03:00
PDFHowTo
People	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
Projects	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
Promo
ScreenHelp
Server	Merge remote-tracking branch 'remotes/origin/feature/adfs' into feature/test-merge-for-release	2022-03-17 15:53:08 +03:00
SideMenu	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
SiteMap	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
SocialLinks
Tags	Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release	2022-03-18 13:30:18 +03:00
Talk	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
TextContainer
TipsTricks	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
Troubleshooting	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
UserGuides	Fix watchvideo_block for new Personal page	2022-03-17 16:21:11 +03:00
VariousControls	Merge remote-tracking branch 'remotes/origin/feature/alibaba-cloud' into feature/test-merge-for-release	2022-03-17 15:13:40 +03:00
Video	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
Webinars
HelpCenter.ascx	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
HelpCenter.de.ascx
HelpCenter.es.ascx
HelpCenter.fr.ascx
HelpCenter.it.ascx
HelpCenter.ru.ascx
HelpSidebarForm.ascx
Search.ascx
Search.de.ascx
Search.es.ascx
Search.fr.ascx
Search.it.ascx
Search.ru.ascx