pavelbannov 3ca0990715 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/EF/Model/FilesConverts.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2020-10-08 19:01:09 +03:00
..
install	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
run	add ASC.TelegramService	2020-09-24 17:30:27 +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	Jenkins: fix	2020-09-04 14:44:58 +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