AlexeySafronov 8d0d5fd908 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs # web/ASC.Web.Components/package.json		2020-07-16 14:41:32 +03:00
..
docker	Merge branch 'master' into feature/files	2020-07-16 14:41:32 +03:00
snap	snap: delete obsolete files	2019-09-10 16:45:51 +03:00
win	win: init commit	2019-09-10 18:20:33 +03:00
install.bat	Requesting administrative privileges for install/uninstall/start/stop	2019-07-11 16:02:33 +03:00
uninstall.bat	Requesting administrative privileges for install/uninstall/start/stop	2019-07-11 16:02:33 +03:00