Merge branch 'master' into feature/files
# Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
This commit is contained in:
commit
483906fed8
@ -38,9 +38,9 @@ using ASC.Core.Common.Settings;
|
||||
using ASC.Core.Tenants;
|
||||
using ASC.ElasticSearch;
|
||||
using ASC.Files.Core.EF;
|
||||
using ASC.Files.Core.Resources;
|
||||
using ASC.Files.Core.Security;
|
||||
using ASC.Files.Core.Thirdparty;
|
||||
using ASC.Files.Core.Resources;
|
||||
using ASC.Files.Thirdparty.ProviderDao;
|
||||
using ASC.Web.Core.Files;
|
||||
using ASC.Web.Files.Classes;
|
||||
|
Loading…
Reference in New Issue
Block a user