AlexeySafronov 8e1f5b30b5 Merge branch 'develop' into feature/workspaces ... # Conflicts: # products/ASC.Files/Client/package.json # products/ASC.Files/Client/yarn.lock # products/ASC.People/Client/package.json # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/package.json # web/ASC.Web.Client/src/App.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Components/yarn.lock # yarn.lock		2021-03-13 16:01:41 +03:00
..
install	Correct spelling	2021-01-18 15:09:43 +03:00
run	Added CRM	2021-01-26 20:36:03 +03:00
scripts	socket.io: fix	2020-08-03 11:20:57 +03:00
start	added getPortalSettings after wizard completed	2020-07-10 19:00:21 +03:00
tools	fix check	2019-07-16 10:32:09 +03:00
build.bat	extract build.sln.bat	2020-10-14 18:24:39 +03:00
build.sln.bat	extract build.sln.bat	2020-10-14 18:24:39 +03:00
Jenkinsfile	Jenkinsfile: fix notify	2021-02-24 15:37:40 +03:00
publish.bat	Added url shortener service install scripts	2020-03-05 14:56:07 +03:00
rebuild.bat	Build: Added wiping of node_modules for Front-end	2020-12-01 13:44:09 +03:00
rebuild.frontend.bat	Build: Fixed bat-files	2020-11-24 13:40:13 +03:00
rebuild.yarnlocks.bat	Build: Fixed bat-files	2020-11-24 13:40:13 +03:00
runasadmin.bat	Requesting administrative privileges for install/uninstall/start/stop	2019-07-11 16:02:33 +03:00