DocSpace-client/config
Alexey Safronov 3b88c07178 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/src/components/index.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/src/components/advanced-selector/index.js
#	web/ASC.Web.Components/src/components/help-button/index.js
#	web/ASC.Web.Components/src/index.js
#       web/ASC.Web.Components/src/components/examples/people.selectors.stories.js [removed]
#
2019-12-14 12:32:31 +03:00
..
nginx Nginx: fix 2019-12-11 18:36:51 +03:00
appsettings.json Config: added cultures 2019-09-23 16:22:14 +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.json External config 2019-06-21 11:03:42 +03:00
autofac.products.json Added ability to connect external products 2019-06-26 12:26:36 +03:00
kafka.json web: Components: AdvancedSelector refactoring: reorganization of files structure 2019-10-30 10:03:37 +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