pavelbannov 29d9f21d05 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # web/ASC.Web.Core/Files/DocumentService.cs		2020-08-31 17:45:57 +03:00
..
install	Merge branch 'master' into feature/files	2020-08-27 12:07:08 +03:00
run	LaunchSettings: fix	2020-08-24 10:45:51 +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	socket.io: fix	2020-08-03 11:20:57 +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