svetlana maleeva 5f94f31004 Merge branch 'feature/docspace' into release/1.12.0 ... # Conflicts: # Web/Controls/Common/BaseHeader/BaseHeader.fr.ascx # Web/Controls/Help/GettingStarted/Configuration/Configuration.ascx # Web/css/help.less		2023-04-21 17:05:07 +03:00
..
Configuration.ascx	Merge branch 'feature/docspace' into release/1.12.0	2023-04-21 17:05:07 +03:00
Configuration.de.ascx	German translation.	2023-02-21 21:35:27 +01:00
Configuration.es.ascx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
Configuration.fr.ascx	updated translations fr	2023-02-28 11:55:39 +03:00
Configuration.it.ascx	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
Configuration.ru.ascx	Fixes for Two-Factor Authentication	2023-02-14 17:51:33 +03:00