Commit Graph

57 Commits

Author SHA1 Message Date
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +03:00
3ff7aeca3b analizators/U2U1015 2022-01-12 13:27:06 +03:00
50c0596eff analizators/U2U1009 2022-01-11 18:37:19 +03:00
d181d43b36 Merge branch 'develop' into feature/async
# Conflicts:
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/ASC.Files.csproj
2021-12-02 12:02:50 +03:00
Vashchuk Nikita
35ceaf7997 Merge branch 'develop' into feature/async 2021-11-22 11:30:38 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00