Vladislav Makhov a72c087e2a Merge branch 'feature/files' into feature/files-favorites ... # Conflicts: # web/ASC.Web.Common/src/api/files/index.js		2020-10-08 10:18:06 +03:00
..
ASC.Web.Api	Merge branch 'master' into feature/files	2020-10-07 13:48:11 +03:00
ASC.Web.Client	Web: Client: confirm: fixed the name of the passed parameter in /people	2020-10-07 19:10:35 +03:00
ASC.Web.Common	Merge branch 'feature/files' into feature/files-favorites	2020-10-08 10:18:06 +03:00
ASC.Web.Components	Merge branch 'feature/files' into feature/files-favorites	2020-10-08 10:18:06 +03:00
ASC.Web.Core	Files: fix openedit	2020-09-28 15:45:26 +03:00
ASC.Web.Studio	Nuget: replaced thirdparty	2020-08-20 17:50:08 +03:00