|
|
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 |
|
|
|
37d36ce86c
|
Supervisor: fix backup
|
2020-10-07 16:10:20 +03:00 |
|
|
|
45678da8e5
|
Merge branch 'master' into feature/files
|
2020-07-10 14:58:37 +03:00 |
|
|
|
74b9676819
|
Docker: added thumbnail, backup, notify
|
2020-07-07 19:26:55 +03:00 |
|
|
|
be09fc0510
|
docker: change config/supervisor/supervisord.conf
|
2020-06-23 19:40:01 +00:00 |
|
|
|
453c812476
|
docker update
|
2020-06-23 18:10:13 +00:00 |
|
|
|
62e179fae0
|
update dockerfile
|
2020-06-23 15:31:48 +00:00 |
|
|
|
f1f313a1bf
|
docker: bug fix
|
2019-10-11 15:34:49 +00:00 |
|
|
|
54f3cc778d
|
docker: init commit
|
2019-10-08 15:00:41 +00:00 |
|
