pavelbannov
7af929fee8
# Conflicts: # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.People/Server/Controllers/PeopleController.cs # products/ASC.People/Server/Models/MemberModel.cs # web/ASC.Web.Api/Controllers/SettingsController.cs |
||
---|---|---|
.. | ||
install | ||
run | ||
scripts | ||
start | ||
tools | ||
build.backend.bat | ||
build.bat | ||
build.frontend.bat | ||
build.static.bat | ||
buildAndDeploy.bat | ||
buildAndDeploy.PERSONAL.bat | ||
createMigrations.bat | ||
Jenkinsfile | ||
publish.bat | ||
run.e2e.test.bat | ||
run.e2e.translations.tests.bat | ||
run.e2e.translations.tests.personal.bat | ||
run.translations.spellcheck.test.bat | ||
run.translations.tests.bat | ||
runasadmin.bat |