DocSpace-client/common/ASC.Socket.IO
pavelbannov 545bacfaf0 Merge branch 'develop' into fix-conflicts-merge
# Conflicts:
#	packages/client/src/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/FileShareOptions.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-07-21 16:51:49 +03:00
..
.yarn removed ignored files 2022-08-12 16:11:25 +03:00
app Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
config Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
.yarnrc.yml ASC.Socket.IO: Upgrade yarn to v3.2.2 2022-07-29 22:24:09 +03:00
package.json ASC.Socket.IO: support CloudWatch transport for winston logger 2022-11-01 12:54:14 +03:00
README.md socket.io: first version 2020-08-02 23:12:45 +03:00
server.js SocketIO: Auth: added auth by share key 2023-05-12 14:57:00 +03:00
yarn.lock ASC.Socket.IO: added yarn.lock 2022-11-02 11:14:01 +03:00

ASC.Socket.IO