pavelbannov 3ca0990715 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/EF/Model/FilesConverts.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2020-10-08 19:01:09 +03:00
..
docker	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +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