Ilya Oleshko 12558b8520 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # packages/client/src/components/Article/Body/index.js # packages/client/src/components/panels/OperationsPanel/index.js # packages/client/src/pages/About/AboutContent.js # packages/client/src/store/FilesActionsStore.js # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs # yarn.lock		2023-08-01 17:56:22 +03:00
..
fonts
images	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
locales	Merge branch 'hotfix/v1.1.2' into develop	2023-08-01 17:56:22 +03:00
offline
scripts	Merge branch 'master' into develop	2023-08-01 14:39:31 +03:00
thirdparty
appIcon-180.png
appIcon-192.png
appIcon-512.png
favicon.ico	Web: change path for favicon.ico	2023-01-23 13:21:51 +03:00
icon.svg
manifest.json