pavelbannov 02f39a9c71 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs # common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # web/ASC.Web.Core/Files/FileUtility.cs		2020-10-13 12:52:28 +03:00
..
ASC.Files	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
ASC.People	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00