Andrey Savihin 675590854c Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data ... # Conflicts: # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs # products/ASC.People/Server/Api/UserController.cs		2023-09-12 15:18:27 +03:00
..
css	Web:Added new fonts open sans v35	2023-08-03 19:44:53 +05:00
fonts/v35	Web: Removed old fonts	2023-08-03 19:47:52 +05:00
images	Merge branch 'develop' into feature/reassign-data	2023-09-06 13:00:15 +03:00
locales	Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data	2023-09-12 15:18:27 +03:00
offline	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
scripts	Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop	2023-09-08 09:46:59 +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
favicon.ico	Web: change path for favicon.ico	2023-01-23 13:21:51 +03:00
icon.svg	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
manifest.json	Update manifest.json	2022-11-13 22:35:19 +03:00