Tatiana Lopaeva
40d56075f1
# Conflicts: # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # common/services/ASC.Data.Backup/Startup.cs # packages/asc-web-common/components/PageLayout/sub-components/section-header.js # products/ASC.Files/Client/public/locales/en/OperationsPanel.json # products/ASC.Files/Client/public/locales/en/Settings.json # products/ASC.Files/Client/public/locales/ru/Settings.json # products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/webpack.config.js |
||
---|---|---|
.. | ||
logo | ||
notification | ||
thirdparties | ||
arrow.right.react.svg | ||
calendar.svg | ||
clouds_fond.png | ||
community_logolarge.png | ||
crm_logolarge.png | ||
dark_general.png | ||
data-management.react.svg | ||
default_user_photo_size_32-32.png | ||
default_user_photo_size_48-48.png | ||
default_user_photo_size_82-82.png | ||
default_user_photo_size_200-200.png | ||
default_user_photo_size_360-360.png | ||
documents240.png | ||
documents.svg | ||
documentsIcon.svg | ||
integration.react.svg | ||
light_small_general.svg | ||
lock.png | ||
logo_personal_about.svg | ||
mail_logolarge.png | ||
mail.svg | ||
payments_enterprise_cubes.svg | ||
payments_enterprise_help.svg | ||
payments_enterprise_icon_first.svg | ||
payments_enterprise_icon_five.svg | ||
payments_enterprise_icon_four.svg | ||
payments_enterprise_icon_second.svg | ||
payments_enterprise_icon_third.svg | ||
payments_enterprise_lock.svg | ||
payments_enterprise_smartphone.svg | ||
payments_enterprise_update.svg | ||
payments_enterprise.svg | ||
people_logolarge.png | ||
projects_logolarge.png | ||
security.react.svg | ||
talk.svg |