TatianaLopaeva ae17671043 Merge branch 'develop' into feature/backup ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/store/SettingsSetupStore.js		2021-06-18 18:08:38 +03:00
..
images	Merge branch 'develop' into feature/backup	2021-05-30 20:57:01 +03:00
locales	Merge branch 'develop' into feature/backup	2021-06-18 18:08:38 +03:00
favicon.ico	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
index.html	Web: added rule to webpack.config for woff, woff2	2021-06-06 23:39:52 +03:00
manifest.json	Files: Init Files.Client	2020-02-25 09:58:09 +03:00