Commit Graph

435 Commits

Author SHA1 Message Date
58334f6ab9
Update README.md 2022-03-10 00:05:11 +01:00
e50679fd0d
Update README.md 2022-03-09 20:17:41 +01:00
cee6f7b507
Update README.md 2022-03-09 19:50:04 +01:00
2514966acd
Update README.md 2022-03-09 19:48:28 +01:00
00a3164f4a
Update README.md 2022-03-09 19:48:13 +01:00
2a34984f86
Update README.md 2022-03-09 19:47:15 +01:00
33e7e8dfd0
Merge pull request #2 from jiriks74/arm64
Remove unnecessary files
2022-03-09 19:04:28 +01:00
a1aa8b21e2 Remove unnecessary files
To clarify, unnecessary for this usecase. To find all files with the modifications in `Dockerfile` for `arm64` look into the [arm64-full_repo](https://github.com/jiriks74/Docker-DocumentServer-Arm64/tree/arm64-full_repo)
2022-03-09 19:01:03 +01:00
d9b82fad23
Merge pull request #1 from jiriks74/arm64
Arm64
2022-03-09 18:59:08 +01:00
ba8a436cb4 Fix postgresql version, no line after \ 2022-03-09 16:55:45 +01:00
05aa933b9a Initial commit
Docker build process now adds debian bullseye repositories, downloads needed arm dependencies, downloads qemu and binfmt, downloads and modifies needed amd64 libraries
Change the install process of documentserver itself: Downloads package from official debian repositories, modifies dependencies, repackages it and resumes the normal install process. Package does not install from `/tmp` but from `/build` which is removed after instalation is completed

`docker-compose.yml` larger stop grace period - Raspberry Pis have slow storage, set to two minutes just to be sure it doesn't get killed because of that
2022-03-09 16:45:56 +01:00
papacarlo
e17831904d Merge branch hotfix/v7.0.1 into master 2022-02-22 08:17:41 +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
Pavel Lobashov
b2e720e66c
Fix broken links to Docker-CommunityServer (#402)
Continue of #400

Those links became incorrect in
e7c8e59a37

I'm not sure that we REALLY need those links in this project, maybe just
give links to README page and that's it
But leaving it as it is
2022-01-31 11:18:50 +03:00
papacarlo
4c959d62b7 Merge branch release/v7.0.0 into release/v7.1.0 2022-01-17 14:34:38 +00:00
papacarlo
973409cc8f Merge branch release/v7.0.0 into master 2022-01-17 14:34:33 +00:00
papacarlo
33faf622c8 Merge branch hotfix/v6.4.2 into release/v7.0.0 2021-10-28 07:33:57 +00:00
papacarlo
44a96b1fde Merge branch hotfix/v6.4.2 into develop 2021-10-28 07:33:55 +00:00
papacarlo
26ef312557 Merge branch hotfix/v6.4.1 into release/v6.5.0 v6.5.0.46 v6.5.0.52 v6.5.0.53 v6.5.0.54 v6.5.0.55 v6.5.0.56 v6.5.0.57 v6.5.0.59 v6.5.0.60 v6.5.0.61 v6.5.0.62 v6.5.0.63 v7.0.0.1 v7.0.0.4 v7.0.0.5 2021-09-30 12:21:08 +00:00
papacarlo
2eb99ffb20 Merge branch hotfix/v6.4.1 into develop v99.99.99.2632 v99.99.99.2633 v99.99.99.2634 v99.99.99.2635 v99.99.99.2636 v99.99.99.2637 v99.99.99.2638 v99.99.99.2639 v99.99.99.2640 v99.99.99.2641 v99.99.99.2642 v99.99.99.2643 v99.99.99.2655 v99.99.99.2656 v99.99.99.2657 v99.99.99.2658 2021-09-30 12:21:03 +00:00
papacarlo
ca39675055 Merge branch hotfix/v6.4.1 into master v6.4.2.1 v6.4.2.12 v6.4.2.13 v6.4.2.14 v6.4.2.2 v6.4.2.3 v6.4.2.4 v6.4.2.6 v6.4.2.7 v6.4.2.8 v6.4.2.9 2021-09-28 08:08:26 +00:00
Semyon Bezrukov
a31a579d24
Add WOPI_ENABLED variable (#379)
* Add WOPI_ENABLED variable

* Add var description
v6.4.1.28 v6.4.1.29 v6.4.1.35 v6.4.1.36 v6.4.1.37 v6.4.1.38 v6.4.1.39 v6.4.1.40 v6.4.1.41 v6.4.1.42 v6.4.1.43 v6.4.1.44 v6.4.1.45 v6.4.1.46 v6.4.1.47 v6.4.1.48 v6.4.1.49 v6.4.1.50
2021-09-14 17:53:37 +03:00
Svetlana Maleeva
32a8a24a0f
Update README.md (#377) 2021-09-14 17:42:55 +03:00
papacarlo
0613f8a0ca Merge branch release/v6.4.0 into develop v6.5.0.1 v6.5.0.10 v6.5.0.11 v6.5.0.12 v6.5.0.13 v6.5.0.14 v6.5.0.15 v6.5.0.16 v6.5.0.17 v6.5.0.18 v6.5.0.19 v6.5.0.2 v6.5.0.20 v6.5.0.21 v6.5.0.22 v6.5.0.23 v6.5.0.24 v6.5.0.25 v6.5.0.26 v6.5.0.27 v6.5.0.3 v6.5.0.43 v6.5.0.44 v6.5.0.5 v6.5.0.6 v6.5.0.7 v6.5.0.8 v99.99.99.2595 v99.99.99.2596 v99.99.99.2597 v99.99.99.2598 v99.99.99.2599 v99.99.99.2603 v99.99.99.2604 v99.99.99.2606 v99.99.99.2607 v99.99.99.2608 v99.99.99.2609 v99.99.99.2610 v99.99.99.2611 v99.99.99.2613 v99.99.99.2614 v99.99.99.2615 v99.99.99.2616 v99.99.99.2617 v99.99.99.2618 v99.99.99.2619 v99.99.99.2620 v99.99.99.2621 v99.99.99.2622 v99.99.99.2624 v99.99.99.2625 v99.99.99.2630 v99.99.99.2631 2021-08-26 13:55:56 +00:00
papacarlo
a23477301e Merge branch release/v6.4.0 into master v6.4.1.1 v6.4.1.10 v6.4.1.13 v6.4.1.14 v6.4.1.15 v6.4.1.16 v6.4.1.18 v6.4.1.19 v6.4.1.2 v6.4.1.20 v6.4.1.21 v6.4.1.22 v6.4.1.23 v6.4.1.24 v6.4.1.25 v6.4.1.26 v6.4.1.27 v6.4.1.3 v6.4.1.4 v6.4.1.5 v6.4.1.6 v6.4.1.7 v6.4.1.8 2021-08-26 11:40:24 +00:00
papacarlo
d654094671 Merge branch hotfix/v6.3.1 into release/v6.4.0 v6.4.0.100 v6.4.0.101 v6.4.0.103 v6.4.0.104 v6.4.0.105 v6.4.0.106 v6.4.0.107 v6.4.0.108 v6.4.0.109 v6.4.0.110 v6.4.0.111 v6.4.0.112 v6.4.0.115 v6.4.0.116 v6.4.0.117 v6.4.0.118 v6.4.0.119 v6.4.0.120 v6.4.0.121 v6.4.0.124 v6.4.0.71 v6.4.0.72 v6.4.0.73 v6.4.0.74 v6.4.0.75 v6.4.0.76 v6.4.0.77 v6.4.0.78 v6.4.0.79 v6.4.0.80 v6.4.0.81 v6.4.0.82 v6.4.0.83 v6.4.0.84 v6.4.0.85 v6.4.0.86 v6.4.0.87 v6.4.0.88 v6.4.0.89 v6.4.0.90 v6.4.0.91 v6.4.0.92 v6.4.0.93 v6.4.0.94 v6.4.0.95 v6.4.0.96 v6.4.0.97 v6.4.0.98 v6.4.0.99 2021-07-15 13:14:47 +00:00
papacarlo
93a0526a7c Merge branch hotfix/v6.3.1 into develop v99.99.99.2514 v99.99.99.2515 v99.99.99.2517 v99.99.99.2518 v99.99.99.2520 v99.99.99.2521 v99.99.99.2522 v99.99.99.2523 v99.99.99.2524 v99.99.99.2525 v99.99.99.2526 v99.99.99.2527 v99.99.99.2528 v99.99.99.2529 v99.99.99.2530 v99.99.99.2531 v99.99.99.2532 v99.99.99.2533 v99.99.99.2534 v99.99.99.2559 v99.99.99.2561 v99.99.99.2562 v99.99.99.2563 v99.99.99.2564 v99.99.99.2565 v99.99.99.2586 v99.99.99.2587 v99.99.99.2588 v99.99.99.2589 v99.99.99.2591 v99.99.99.2592 v99.99.99.2593 2021-07-15 13:14:43 +00:00
Roman Demidov
5bf1ff715f
Remove server version of spell checker (#365) v6.4.0.34 v6.4.0.35 v6.4.0.36 v6.4.0.37 v6.4.0.38 v6.4.0.39 v6.4.0.40 v6.4.0.41 v6.4.0.42 v6.4.0.43 v6.4.0.44 v6.4.0.45 v6.4.0.52 v6.4.0.54 v6.4.0.55 v6.4.0.56 v6.4.0.57 v6.4.0.58 v6.4.0.59 v6.4.0.60 v6.4.0.61 v6.4.0.62 v6.4.0.66 v6.4.0.67 v6.4.0.70 2021-06-22 09:59:50 +03:00
Semyon Bezrukov
c6e7d68016
Fix docker targets (#361)
* Fix docker targets

* Fix docker latest tag
v99.99.99.2466 v99.99.99.2467 v99.99.99.2468 v99.99.99.2469 v99.99.99.2470 v99.99.99.2471 v99.99.99.2472 v99.99.99.2473 v99.99.99.2474 v99.99.99.2478 v99.99.99.2479 v99.99.99.2480 v99.99.99.2481 v99.99.99.2482 v99.99.99.2483 v99.99.99.2484 v99.99.99.2486 v99.99.99.2487 v99.99.99.2488 v99.99.99.2489 v99.99.99.2490 v99.99.99.2491 v99.99.99.2492 v99.99.99.2495 v99.99.99.2496 v99.99.99.2497 v99.99.99.2498 v99.99.99.2499 v99.99.99.2501 v99.99.99.2502 v99.99.99.2503 v99.99.99.2504 v99.99.99.2505 v99.99.99.2506 v99.99.99.2507 v99.99.99.2508 v99.99.99.2509 v99.99.99.2510 v99.99.99.2511 v99.99.99.2512
2021-06-01 17:29:31 +03:00
papacarlo
13a01e7c56 Merge branch release/v6.3.0 into develop v6.4.0.10 v6.4.0.11 v6.4.0.13 v6.4.0.14 v6.4.0.15 v6.4.0.16 v6.4.0.17 v6.4.0.18 v6.4.0.19 v6.4.0.20 v6.4.0.21 v6.4.0.22 v6.4.0.23 v6.4.0.25 v6.4.0.30 v6.4.0.31 v6.4.0.32 v6.4.0.33 v6.4.0.6 v6.4.0.7 v6.4.0.8 v6.4.0.9 v99.99.99.2452 v99.99.99.2453 v99.99.99.2454 v99.99.99.2455 v99.99.99.2456 v99.99.99.2457 v99.99.99.2458 v99.99.99.2465 2021-05-20 12:08:20 +00:00
papacarlo
3b830417a2 Merge branch release/v6.3.0 into master v6.3.1.1 v6.3.1.10 v6.3.1.11 v6.3.1.13 v6.3.1.14 v6.3.1.15 v6.3.1.16 v6.3.1.17 v6.3.1.2 v6.3.1.23 v6.3.1.24 v6.3.1.25 v6.3.1.26 v6.3.1.27 v6.3.1.29 v6.3.1.3 v6.3.1.30 v6.3.1.31 v6.3.1.32 v6.3.1.33 v6.3.1.36 v6.3.1.37 v6.3.1.38 v6.3.1.39 v6.3.1.4 v6.3.1.40 v6.3.1.41 v6.3.1.42 v6.3.1.45 v6.3.1.46 v6.3.1.49 v6.3.1.5 v6.3.1.50 v6.3.1.52 v6.3.1.53 v6.3.1.54 v6.3.1.55 v6.3.1.56 v6.3.1.57 v6.3.1.58 v6.3.1.59 v6.3.1.6 v6.3.1.60 v6.3.1.61 v6.3.1.62 v6.3.1.63 v6.3.1.64 v6.3.1.65 v6.3.1.66 v6.3.1.67 v6.3.1.68 v6.3.1.69 v6.3.1.7 v6.3.1.70 v6.3.1.71 v6.3.1.72 v6.3.1.73 v6.3.1.74 v6.3.1.75 v6.3.1.76 v6.3.1.77 v6.3.1.78 v6.3.1.79 v6.3.2.2 v6.3.2.4 v6.3.2.5 v6.3.2.6 v6.3.2.7 v6.3.2.8 2021-05-20 12:08:15 +00:00
papacarlo
245659807a Merge branch hotfix/v6.2.2 into release/v6.3.0 v6.3.0.100 v6.3.0.103 v6.3.0.104 v6.3.0.105 v6.3.0.106 v6.3.0.107 v6.3.0.108 v6.3.0.109 v6.3.0.110 v6.3.0.111 v6.3.0.113 v6.3.0.114 v6.3.0.115 v6.3.0.116 v6.3.0.92 v6.3.0.93 v6.3.0.94 v6.3.0.95 v6.3.0.96 v6.3.0.97 v6.3.0.98 v6.3.0.99 2021-05-07 13:27:20 +00:00
papacarlo
2f26419ac7 Merge branch hotfix/v6.2.2 into develop v99.99.99.2434 v99.99.99.2435 v99.99.99.2436 v99.99.99.2437 v99.99.99.2439 v99.99.99.2441 v99.99.99.2442 v99.99.99.2443 v99.99.99.2444 v99.99.99.2445 v99.99.99.2446 v99.99.99.2447 v99.99.99.2448 v99.99.99.2449 v99.99.99.2450 v99.99.99.2451 2021-05-07 13:25:56 +00:00
Pavel Lobashov
67df644858
Precise info about table existance (#355) v6.3.0.73 v6.3.0.74 v6.3.0.76 v6.3.0.77 v6.3.0.78 v6.3.0.79 v6.3.0.82 v6.3.0.83 v6.3.0.84 v6.3.0.85 v6.3.0.86 v6.3.0.88 v6.3.0.89 v6.3.0.91 2021-04-29 12:14:31 +03:00
papacarlo
ca6b3a67a3 Merge branch hotfix/v6.2.2 into master 2021-04-19 12:18:58 +00:00
Roman Demidov
f2c708cff2
Reset database tables on update (#351)
* Reset database tables on update

* Add changes

* Add changes

* Add changes

* Add changes

* Add changes

* Add changes
v6.3.0.56 v6.3.0.57 v6.3.0.58 v6.3.0.61 v6.3.0.62 v6.3.0.63 v6.3.0.64 v6.3.0.65 v6.3.0.66 v6.3.0.67 v6.3.0.68 v6.3.0.69 v6.3.0.70 v6.3.0.71 v6.3.0.72
2021-04-14 17:10:38 +03:00
Alexey Golubev
2f26cea790
Fix #347 (#349) v6.2.2.11 v6.2.2.12 v6.2.2.13 v6.2.2.14 v6.2.2.15 v6.2.2.16 v6.2.2.17 v6.2.2.18 v6.2.2.19 v6.2.2.20 v6.2.2.21 v6.2.2.22 v6.2.2.23 v6.2.2.24 v6.2.2.25 v6.2.2.26 v6.2.2.27 v6.2.2.28 v6.2.2.29 v6.2.2.30 v6.2.2.31 v6.2.2.32 v6.2.2.33 v6.2.2.34 v6.2.2.35 v6.2.2.36 v6.2.2.37 v6.2.2.38 v6.2.2.39 v6.2.2.40 v6.2.2.41 v6.2.2.42 v6.2.2.43 v6.2.2.44 v6.2.2.9 2021-04-01 10:07:07 +03:00
papacarlo
30c5612cfb Merge branch hotfix/v6.2.1 into release/v6.3.0 v6.3.0.36 v6.3.0.37 v6.3.0.39 v6.3.0.40 v6.3.0.41 v6.3.0.43 v6.3.0.45 v6.3.0.46 v6.3.0.47 v6.3.0.48 v6.3.0.49 v6.3.0.50 v6.3.0.51 v6.3.0.52 v6.3.0.53 v6.3.0.54 v6.3.0.55 2021-03-31 11:27:32 +00:00
papacarlo
cbb749d77c Merge branch hotfix/v6.2.1 into develop v99.99.99.2384 v99.99.99.2385 v99.99.99.2388 v99.99.99.2389 v99.99.99.2390 v99.99.99.2391 v99.99.99.2392 v99.99.99.2393 v99.99.99.2395 v99.99.99.2396 v99.99.99.2397 v99.99.99.2398 v99.99.99.2415 v99.99.99.2416 v99.99.99.2417 v99.99.99.2418 v99.99.99.2419 v99.99.99.2423 v99.99.99.2424 v99.99.99.2425 v99.99.99.2426 v99.99.99.2428 v99.99.99.2432 v99.99.99.2433 2021-03-31 11:27:26 +00:00
jdoubleu
1cfe84b8b8
Fix automatic port detection for database (#341) v6.3.0.24 v6.3.0.25 v6.3.0.26 v6.3.0.27 v6.3.0.33 v6.3.0.34 v6.3.0.35 2021-03-19 16:20:52 +03:00
papacarlo
30ca844513 Merge branch release/v6.2.0 into release/v6.3.0 v6.3.0.23 2021-03-19 07:54:45 +00:00
papacarlo
c611b2b080 Merge branch release/v6.2.0 into develop v99.99.99.2371 v99.99.99.2372 v99.99.99.2377 v99.99.99.2378 2021-03-18 15:22:47 +00:00
papacarlo
9dc5f5d993 Merge branch release/v6.2.0 into master v6.2.1.1 v6.2.1.11 v6.2.1.12 v6.2.1.13 v6.2.1.15 v6.2.1.16 v6.2.1.17 v6.2.1.19 v6.2.1.2 v6.2.1.20 v6.2.1.21 v6.2.1.22 v6.2.1.23 v6.2.1.24 v6.2.1.25 v6.2.1.26 v6.2.1.3 v6.2.1.4 v6.2.1.5 v6.2.1.6 v6.2.1.9 2021-03-01 08:47:27 +00:00
Semyon Bezrukov
393006d306
Add pull ubuntu image (#334) v6.2.0.122 v6.2.0.123 v6.2.0.124 v6.2.0.125 v6.2.0.126 v6.2.0.127 v6.2.0.128 v6.2.0.129 v6.2.0.130 v6.2.0.131 v6.2.0.133 v6.2.0.134 v6.2.0.135 v6.2.0.136 v6.2.0.137 v6.2.0.138 v6.2.0.139 v6.2.0.140 v6.2.0.141 v6.2.0.142 v6.2.0.143 v6.2.0.144 v6.2.0.146 v6.2.0.147 v6.2.0.148 v6.2.0.149 v6.2.0.150 2021-02-24 18:34:03 +03:00
papacarlo
ea0fcf3951 Merge branch hotfix/v6.1.1 into develop v6.3.0.10 v6.3.0.11 v6.3.0.12 v6.3.0.13 v6.3.0.14 v6.3.0.15 v6.3.0.16 v6.3.0.18 v6.3.0.19 v6.3.0.20 v6.3.0.21 v6.3.0.22 v6.3.0.4 v6.3.0.5 v6.3.0.6 v6.3.0.7 v6.3.0.8 v6.3.0.9 v99.99.99.2285 v99.99.99.2286 v99.99.99.2290 v99.99.99.2298 v99.99.99.2299 v99.99.99.2301 v99.99.99.2306 v99.99.99.2307 v99.99.99.2308 v99.99.99.2309 v99.99.99.2310 v99.99.99.2311 v99.99.99.2312 v99.99.99.2313 v99.99.99.2315 v99.99.99.2316 v99.99.99.2317 v99.99.99.2318 v99.99.99.2319 v99.99.99.2320 v99.99.99.2321 v99.99.99.2322 v99.99.99.2327 v99.99.99.2332 v99.99.99.2336 v99.99.99.2337 v99.99.99.2338 v99.99.99.2339 v99.99.99.2342 v99.99.99.2345 v99.99.99.2346 v99.99.99.2347 v99.99.99.2348 v99.99.99.2349 v99.99.99.2350 v99.99.99.2351 v99.99.99.2352 v99.99.99.2353 v99.99.99.2354 v99.99.99.2355 v99.99.99.2356 v99.99.99.2357 v99.99.99.2358 v99.99.99.2359 v99.99.99.2360 v99.99.99.2361 v99.99.99.2363 v99.99.99.2364 v99.99.99.2365 v99.99.99.2366 2021-01-28 08:28:05 +00:00
Alexey Golubev
cbff89bdea
Merge pull request #323 from ONLYOFFICE/hotfix/v6.1.1
Merge hotfix/v6.1.1 into release/v6.2.0
v6.2.0.100 v6.2.0.102 v6.2.0.103 v6.2.0.104 v6.2.0.105 v6.2.0.106 v6.2.0.107 v6.2.0.108 v6.2.0.111 v6.2.0.113 v6.2.0.114 v6.2.0.115 v6.2.0.116 v6.2.0.117 v6.2.0.118 v6.2.0.119 v6.2.0.121 v6.2.0.28 v6.2.0.29 v6.2.0.30 v6.2.0.31 v6.2.0.32 v6.2.0.33 v6.2.0.39 v6.2.0.40 v6.2.0.41 v6.2.0.42 v6.2.0.43 v6.2.0.44 v6.2.0.45 v6.2.0.46 v6.2.0.49 v6.2.0.50 v6.2.0.51 v6.2.0.52 v6.2.0.54 v6.2.0.55 v6.2.0.56 v6.2.0.57 v6.2.0.58 v6.2.0.59 v6.2.0.61 v6.2.0.62 v6.2.0.63 v6.2.0.64 v6.2.0.65 v6.2.0.66 v6.2.0.69 v6.2.0.70 v6.2.0.71 v6.2.0.72 v6.2.0.73 v6.2.0.74 v6.2.0.75 v6.2.0.80 v6.2.0.82 v6.2.0.83 v6.2.0.92 v6.2.0.93 v6.2.0.94 v6.2.0.95 v6.2.0.96 v6.2.0.97 v6.2.0.98 v6.2.0.99
2020-12-25 11:31:19 +03:00
papacarlo
9676e7aac1 Merge branch release/v6.1.0 into develop v99.99.99.2240 v99.99.99.2241 v99.99.99.2242 v99.99.99.2246 v99.99.99.2247 v99.99.99.2248 v99.99.99.2249 v99.99.99.2255 v99.99.99.2259 v99.99.99.2263 v99.99.99.2264 v99.99.99.2267 v99.99.99.2268 v99.99.99.2269 v99.99.99.2270 v99.99.99.2271 v99.99.99.2272 v99.99.99.2273 2020-12-24 07:52:11 +00:00
Semyon Bezrukov
e7d2cc2cd5
Edit s3 paths (#319)
* Edit s3 paths

* DocumentServer installed by url

* Fix install recommends
v99.99.99.2215 v99.99.99.2216 v99.99.99.2217 v99.99.99.2218 v99.99.99.2221
2020-12-16 11:39:05 +03:00
papacarlo
93740b7c37 Merge branch release/v6.1.0 into master v6.1.1.1 v6.1.1.10 v6.1.1.11 v6.1.1.12 v6.1.1.13 v6.1.1.14 v6.1.1.15 v6.1.1.16 v6.1.1.17 v6.1.1.18 v6.1.1.2 v6.1.1.21 v6.1.1.22 v6.1.1.23 v6.1.1.24 v6.1.1.25 v6.1.1.26 v6.1.1.27 v6.1.1.28 v6.1.1.29 v6.1.1.3 v6.1.1.32 v6.1.1.33 v6.1.1.34 v6.1.1.35 v6.1.1.37 v6.1.1.4 v6.1.1.41 v6.1.1.42 v6.1.1.43 v6.1.1.48 v6.1.1.49 v6.1.1.5 v6.1.1.51 v6.1.1.52 v6.1.1.53 v6.1.1.54 v6.1.1.55 v6.1.1.56 v6.1.1.6 v6.1.1.7 v6.1.1.8 v6.1.1.9 2020-12-08 07:07:57 +00:00
papacarlo
d26fd0d234 Merge branch hotfix/v6.0.2 into release/v6.1.0 v6.1.0.95 2020-12-07 14:38:53 +00:00