Vladislav Makhov 79989f7bf4 Merge branch 'develop' into feature/desktop-view ... # Conflicts: # products/ASC.Files/Client/src/components/Article/MainButton/index.js # products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json # products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json # web/ASC.Web.Common/src/store/auth/actions.js		2020-12-24 10:21:02 +03:00
..
images	Merge branch 'develop' into feature/desktop-view	2020-12-24 10:21:02 +03:00
favicon.ico	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
index.html	Web: Files: DocEditor: Added meta data (favicon, title). Adding "*" when data is not saved. Changing title in DocEditor when changing filename	2020-12-21 14:04:40 +03:00
manifest.json	Files: Init Files.Client	2020-02-25 09:58:09 +03:00