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
..
20201006100833_MessagesContextMySql.cs	revert discard	2020-10-12 22:39:23 +03:00
20201006100833_MessagesContextMySql.Designer.cs	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
MessagesContextModelSnapshot.cs	fix migrations	2020-10-06 14:39:44 +03:00