6543 145043a515 Extend Merge Options (#217) ... 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		2020-04-11 20:20:26 +00:00
..
assets/fonts	Implementation of custom fonts app wide	2020-01-02 01:03:53 +05:00
java/org/mian/gitnex	Extend Merge Options (#217)	2020-04-11 20:20:26 +00:00
res	Extend Merge Options (#217)	2020-04-11 20:20:26 +00:00
AndroidManifest.xml	Fix minor formattings, other improvements	2020-04-01 20:28:14 +05:00
app_logo-web.png	initial push	2019-06-04 02:25:05 +05:00