AlexeySafronov 7f095f03d1 Merge branch 'master' into feature/Wizard ... # Conflicts: # common/ASC.Resource.Manager/Startup.cs # config/kafka.json # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx # web/ASC.Web.Core/TariffSettings.cs		2020-07-15 15:23:28 +03:00
..
nginx	Removed unused proto, added backup rewrite	2020-06-25 19:05:14 +03:00
appsettings.json	Thumbnails: fix	2020-06-17 14:00:28 +03:00
appsettings.services.json	Added url shortener service launcher	2020-03-05 14:55:12 +03:00
appsettings.test.json	Files: fix convert	2020-07-03 13:36:31 +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	removed files	2020-02-28 16:23:30 +03:00
backup.json	Backup: refactoring	2020-06-03 12:15:05 +03:00
kafka.json	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +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	Files: ef, di	2020-02-19 11:37:52 +03:00
thumb.json	Thumbnails: fix	2020-06-17 14:00:28 +03:00
thumb.test.json	Thumb: fix	2020-06-26 12:55:19 +03:00
urlshortener.test.json	fix log, added UrlShortenerService config	2020-05-21 11:03:35 +03:00