pavelbannov ff84afb110 Merge branch 'master' into feature/elastic ... # Conflicts: # web/ASC.Web.Core/SetupInfo.cs		2020-02-05 11:43:03 +03:00
..
ImageOptions.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
WebImageSupplier.cs	Merge branch 'master' into feature/elastic	2020-02-05 11:43:03 +03:00
WebSkinSettings.cs	DI: configuration	2019-09-23 15:20:08 +03:00