pavelbannov 8ea04bcc81 Merge branch 'develop' into feature/12.0 ... # Conflicts: # common/ASC.MessagingSystem/Data/MessagesRepository.cs # products/ASC.Files/Core/Utils/FileConverter.cs		2022-06-17 19:19:00 +03:00
..
Parse	moved from ddf515b8	2022-06-05 18:44:37 +03:00
OCMigratingCalendar.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00
OCMigratingContacts.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00
OCMigratingFiles.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
OCMigratingGroups.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00
OCMigratingMail.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00
OCMigratingUser.cs	moved from ddf515b8	2022-06-16 11:13:53 +03:00
OCMigrationinfo.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00