pavelbannov 2782d9f64c Merge branch 'master' into feature/ef ... # Conflicts: # common/ASC.VoipService/Dao/CachedVoipDao.cs # common/ASC.VoipService/Dao/VoipDao.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2019-12-23 16:25:33 +03:00
..
ASC.Web.Api	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00
ASC.Web.Client	web: Common: Moved Layout and PageLayout to asc-web-common	2019-12-20 14:35:53 +03:00
ASC.Web.Common	web: common: bump version	2019-12-20 14:40:24 +03:00
ASC.Web.Components	web: components: bump version	2019-12-23 14:41:42 +03:00
ASC.Web.Core	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00
ASC.Web.Studio	Consumers: added config	2019-12-20 14:17:01 +03:00