pavelbannov 6d92275269 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs		2020-08-14 11:42:13 +03:00
..
ASC.Files	Merge branch 'master' into feature/files	2020-08-14 11:42:13 +03:00
ASC.People	Web: Components: Fix rotate in avatar editor	2020-08-14 08:29:15 +03:00