Skip to content

Commit 08a664b

Browse files
committed
Merge branch 'main' into fix-locale-backport
# Conflicts: # options/locale/locale_el-GR.ini
2 parents 65217ed + 1d35fa0 commit 08a664b

File tree

3 files changed

+269
-9
lines changed

3 files changed

+269
-9
lines changed

docs/content/doc/features/comparison.en-us.md

+3
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,15 @@ _Symbols used in table:_
118118
| Rebase merging ||||||||
119119
| Pull/Merge request inline comments ||||||||
120120
| Pull/Merge request approval ||||||||
121+
| Pull/Merge require approval ||||||||
122+
| Pull/Merge multiple reviewers ||||||||
121123
| Merge conflict resolution | [](https://github.com/go-gitea/gitea/issues/9014) |||||||
122124
| Restrict push and merge access to certain users ||||||||
123125
| Revert specific commits ||||||||
124126
| Pull/Merge requests templates ||||||||
125127
| Cherry-picking changes ||||||||
126128
| Download Patch |||||| / ||
129+
| Merge queues ||||||||
127130

128131
## 3rd-party integrations
129132

0 commit comments

Comments
 (0)