Update to be in line with main repository #5

Merged
jiriks74 merged 11 commits from master into master 2022-05-15 14:24:56 +02:00

11 Commits

Author SHA1 Message Date
papacarlo
95e27e2655 Merge branch release/v7.1.0 into master 2022-05-12 13:21:23 +00:00
Roman Demidov
452dfeb56d
Fix bug #56785 (#434)
* Fix bug #56785

* Changes for root
2022-04-29 14:57:14 +03:00
Roman Demidov
80acbe974d
Fix bug #53046 : sed error starting container on Arch (#433) 2022-04-29 14:55:25 +03:00
Alexey Golubev
4fb0a1e712
Improve SSL certificate detection (#431) 2022-04-25 17:25:19 +03:00
Alexey Golubev
39d2e303f1 Fix disabling JWT 2022-04-12 19:00:46 +03:00
papacarlo
decb1ed860 Merge branch hotfix/v7.0.2 into release/v7.1.0 2022-04-05 12:27:33 +00:00
papacarlo
bb160d345e Merge branch hotfix/v7.0.1 into release/v7.1.0 2022-03-23 10:29:52 +00:00
Stavros Kois
21f5019e1c
Initialliaze services.CoAuthoring.redis before attempting to set a child to a value (#404)
Co-authored-by: papacarlo <builder@onlyoffice.com>
2022-02-09 10:37:52 +03:00
papacarlo
4c959d62b7 Merge branch release/v7.0.0 into release/v7.1.0 2022-01-17 14:34:38 +00:00
papacarlo
44a96b1fde Merge branch hotfix/v6.4.2 into develop 2021-10-28 07:33:55 +00:00
papacarlo
2eb99ffb20 Merge branch hotfix/v6.4.1 into develop 2021-09-30 12:21:03 +00:00