DocSpace-client/products/ASC.Files/Server
AlexeySafronov 11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:40:24 +03:00
..
Controllers Files: startedit. fix empty body 2021-10-06 22:43:28 +03:00
DocStore@9fea7818de Merge branch 'master' into hotfix/v1.1.1 2021-11-21 14:40:24 +03:00
Helpers fix Bug 52983 2021-10-12 10:24:51 +03:00
Properties refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
appsettings.json Files: Startup 2020-02-12 13:48:58 +03:00
ASC.Files.csproj RazorCompileOnBuild:false< 2021-06-16 20:08:26 +03:00
ProductEntryPoint.cs Api: modules. Added info method 2021-01-25 17:37:26 +03:00
Program.cs Files: increase limits 2021-08-31 17:03:51 +03:00
Startup.cs Log: fix configuring 2021-07-13 21:17:18 +03:00