Vashchuk Nikita 82abf11109 Merge branch 'develop' into feature/calendar ... # Conflicts: # ASC.Web.sln # config/autofac.products.json # config/nginx/onlyoffice.conf # products/ASC.Calendar/Server/ASC.Calendar.csproj # products/ASC.Calendar/Server/Controllers/CalendarController.cs # products/ASC.Calendar/Server/Program.cs # products/ASC.Calendar/Server/Properties/launchSettings.json # products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs # products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx # products/ASC.Calendar/Server/Startup.cs		2021-05-18 13:24:02 +03:00
..
nginx	Merge branch 'develop' into feature/calendar	2021-05-18 13:24:02 +03:00
appsettings.json	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
appsettings.services.json	Added url shortener service launcher	2020-03-05 14:55:12 +03:00
appsettings.test.json	Modify file json format	2021-02-05 11:20:42 +03:00
autofac.consumers.json	fixed login handler	2021-02-10 22:43:18 +03:00
autofac.json	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
autofac.products.json	Merge branch 'develop' into feature/calendar	2021-05-18 13:24:02 +03:00
backup.json	Backup: refactoring	2020-06-03 12:15:05 +03:00
kafka.json	Reverted kafka config	2021-04-21 16:08:24 +03:00
kafka.test.json	kafka disabled by default	2019-08-23 15:49:23 +03:00
nlog.config	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
notify.json	Notify: added email sender	2019-09-25 13:36:22 +03:00
socket.json	socket.io: first version	2020-08-02 23:12:45 +03:00
storage.json	moved from 2e37dcd0	2020-12-28 16:22:08 +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