Tatiana Lopaeva 7b623c4e30 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/utils/settingsTree.js # packages/common/store/AuthStore.js # packages/components/slider/index.js # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2022-09-05 10:19:52 +03:00
..
fonts
images	Merge branch 'develop' into feature/accounts-list	2022-08-31 11:38:34 +03:00
locales	Merge branch 'develop' into feature/stripe	2022-09-05 10:19:52 +03:00
offline	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
scripts	Web: Integration: Fixed parsing property from script url	2022-08-05 17:03:04 +03:00
thirdparty	Web: Fixed callback pages, added login callback for desktop client	2021-10-19 10:31:34 +03:00
appIcon-180.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-192.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-512.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
bg-error.png
favicon.ico	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
icon.svg	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
manifest.json	Web: Client: Fixed manifest.json for apply new icons	2022-05-27 14:56:16 +03:00