DocSpace-buildtools/common/services
pavelbannov 9968873305 Merge branch 'master' into feature/fix_API_return
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
..
ASC.ApiSystem revert discard 2020-10-12 22:39:23 +03:00
ASC.Data.Backup Merge branch 'master' into feature/fix_API_return 2020-10-13 13:33:24 +03:00
ASC.Data.Storage.Encryption revert discard 2020-10-12 22:39:23 +03:00
ASC.Data.Storage.Migration revert discard 2020-10-12 22:39:23 +03:00
ASC.ElasticSearch revert discard 2020-10-12 22:39:23 +03:00
ASC.Feed.Aggregator revert discard 2020-10-12 22:39:23 +03:00
ASC.Notify revert discard 2020-10-12 22:39:23 +03:00
ASC.Socket.IO.Svc revert discard 2020-10-12 22:39:23 +03:00
ASC.Studio.Notify revert discard 2020-10-12 22:39:23 +03:00
ASC.TelegramService revert discard 2020-10-12 22:39:23 +03:00
ASC.Thumbnails.Svc revert discard 2020-10-12 22:39:23 +03:00
ASC.UrlShortener.Svc revert discard 2020-10-12 22:39:23 +03:00