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
..
nginx	Nginx: fix	2019-12-11 18:36:51 +03:00
appsettings.json	EF: added support mysql 8.0	2019-12-18 15:25:32 +03:00
appsettings.services.json	Added ASC.Studio.Notify service	2019-08-01 11:47:15 +03:00
appsettings.test.json	fixed config	2019-11-15 18:06:02 +03:00
autofac.consumers.json	Consumers: added config	2019-12-20 16:12:59 +03:00
autofac.json	External config	2019-06-21 11:03:42 +03:00
autofac.products.json	Consumers: added config	2019-12-20 14:17:01 +03:00
kafka.json	kafka disabled by default	2019-08-23 15:49:23 +03:00
kafka.test.json	kafka disabled by default	2019-08-23 15:49:23 +03:00
nlog.config	Common nlog config	2019-11-15 11:47:56 +03:00
notify.json	Notify: added email sender	2019-09-25 13:36:22 +03:00
storage.json	External config	2019-06-21 11:03:42 +03:00