[PR #314] [MERGED] Merge branch release/v6.1.0 into master #546

Closed
opened 2026-02-26 10:33:01 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ONLYOFFICE/Docker-DocumentServer/pull/314
Author: @papacarlo
Created: 12/1/2020
Status: Merged
Merged: 12/1/2020
Merged by: @papacarlo

Base: masterHead: release/v6.1.0


📝 Commits (10+)

  • be27b2b Merge branch hotfix/v5.6.0 into develop
  • c5d15c3 Merge branch hotfix/v5.6.1 into develop
  • abe349d Merge branch hotfix/v5.6.2 into develop
  • 380ac3e Merge branch hotfix/v5.6.4 into develop
  • 1956f98 Fixes exit procedure. (#286)
  • 85158c3 Merge branch release/v6.0.0 into develop
  • 2685410 Add consent to the fonts license (#297)
  • 211ae50 Fix #281: Add option to disable CPU-heavy tasks on startup (#293)
  • bdef500 Allow let's encrypte sertificates (#300)
  • 9e63609 Fix custom db name bug (#304)

📊 Changes

5 files changed (+52 additions, -21 deletions)

View changed files

📝 Dockerfile (+12 -6)
📝 README.md (+11 -1)
📝 docker-compose.yml (+1 -0)
📝 run-document-server.sh (+27 -13)
📝 tests/test.sh (+1 -1)

📄 Description

No description provided


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ONLYOFFICE/Docker-DocumentServer/pull/314 **Author:** [@papacarlo](https://github.com/papacarlo) **Created:** 12/1/2020 **Status:** ✅ Merged **Merged:** 12/1/2020 **Merged by:** [@papacarlo](https://github.com/papacarlo) **Base:** `master` ← **Head:** `release/v6.1.0` --- ### 📝 Commits (10+) - [`be27b2b`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/be27b2b4d626153f297243b1892f03c8c8f0f599) Merge branch hotfix/v5.6.0 into develop - [`c5d15c3`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/c5d15c3be7ecf4e3fbc43b07c752fa8352a0ee03) Merge branch hotfix/v5.6.1 into develop - [`abe349d`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/abe349dad9826dd217d7c7535fbbd66dbf74462d) Merge branch hotfix/v5.6.2 into develop - [`380ac3e`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/380ac3e2278a984007e4a74888ad91ef5aa8115a) Merge branch hotfix/v5.6.4 into develop - [`1956f98`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/1956f98c1d3704bc23d38a94ba90ec7cd8d497b4) Fixes exit procedure. (#286) - [`85158c3`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/85158c3624e88bba8f15e82bdd595bf3d3167926) Merge branch release/v6.0.0 into develop - [`2685410`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/26854106a35c18df6b1c4c83b4062553ced6250b) Add consent to the fonts license (#297) - [`211ae50`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/211ae509801d464da559745c370a1e42e90a2621) Fix #281: Add option to disable CPU-heavy tasks on startup (#293) - [`bdef500`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/bdef500858ca0ea88f3b6801e24d384e41f25797) Allow let's encrypte sertificates (#300) - [`9e63609`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/9e63609c14fe2f023629b268ea7e8d3d591afe9f) Fix custom db name bug (#304) ### 📊 Changes **5 files changed** (+52 additions, -21 deletions) <details> <summary>View changed files</summary> 📝 `Dockerfile` (+12 -6) 📝 `README.md` (+11 -1) 📝 `docker-compose.yml` (+1 -0) 📝 `run-document-server.sh` (+27 -13) 📝 `tests/test.sh` (+1 -1) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-26 10:33:01 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/Docker-DocumentServer-ONLYOFFICE#546
No description provided.