Artem Tarasov 1a8aacebdc Merge branch 'master' into feature/Wizard ... # Conflicts: # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # common/ASC.Resource.Manager/Startup.cs # web/ASC.Web.Components/src/components/password-input/index.js		2020-07-21 13:13:47 +03:00
..
install	Docker: fix	2020-07-16 14:27:30 +03:00
run	Merge branch 'master' into feature/backup	2020-06-25 19:21:42 +03:00
scripts	Thumbnails: fix	2020-06-17 14:00:28 +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	Thumbnails: fix	2020-06-17 14:00:28 +03:00
Jenkinsfile	Jenkinsfile: chat_id to credentials	2020-01-15 13:35:21 +03:00
publish.bat	Added url shortener service install scripts	2020-03-05 14:56:07 +03:00
rebuild.bat	Added url shortener service install scripts	2020-03-05 14:56:07 +03:00
runasadmin.bat	Requesting administrative privileges for install/uninstall/start/stop	2019-07-11 16:02:33 +03:00