Merge branch 'master' into extend-merge-dialog
Minor fixes
format
? an AndroidStudio suggestion ?
Signed-off-by: 6543 <6543@obermui.de>
add Title Text and some Fixes
add version check
Merge branch 'master' into extend-merge-dialog
Merge branch 'master' into extend-merge-dialog
use translation and revormat
make Merge Options Translateble
gitea locale revs:
* pulls.merge_pull_request
* pulls.rebase_merge_pull_request
* pulls.rebase_merge_commit_pull_request
* pulls.squash_merge_pull_request
Fix menu item
Make merge options work
Merge branch 'master' into merge-options
work - but UGLY UI
use enum for merge-modes
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/217
145043a515