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
..
app_logo_background.xml	initial push	2019-06-04 02:25:05 +05:00
attrs.xml	Share feature and some refactor to easily manage source code files	2020-03-17 00:28:03 +05:00
colors.xml	Introduce snackbar for toast messages (#352)	2020-04-04 19:19:44 +00:00
credits.xml	Remove credits, add donators (#268)	2020-02-21 05:58:36 +00:00
dimens.xml	Replacing bottom sheet item by floating action button. (#360)	2020-04-07 20:06:39 +00:00
gitea_version.xml	Prepare release 2.4.0 (#283)	2020-03-15 15:09:26 +00:00
protocols.xml	initial push	2019-06-04 02:25:05 +05:00
sponsors.xml	Remove credits, add donators (#268)	2020-02-21 05:58:36 +00:00
strings.xml	Extend Merge Options (#217)	2020-04-11 20:20:26 +00:00
styles.xml	Fixes to color styles and layouts	2020-03-05 20:23:15 +05:00
themes.xml	Remove commits tab, moved under branch. Commits are under branches now.	2020-03-28 17:44:45 +05:00