diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 12:08:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 12:08:04 +0000 |
| commit | eb30dd6e28f6fc9eb8021d205f6ed84511f001e2 (patch) | |
| tree | 9557e4782c762f4d08f57c9e04991bf988695085 /app/views/projects/_merge_request_settings_description_text.html.haml | |
| parent | c3ad57034cc1cbd6d0ad02de7ac57f6004440c83 (diff) | |
| download | gitlab-ce-eb30dd6e28f6fc9eb8021d205f6ed84511f001e2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/_merge_request_settings_description_text.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_settings_description_text.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_merge_request_settings_description_text.html.haml b/app/views/projects/_merge_request_settings_description_text.html.haml index 42964c900b3..dc9dc92675d 100644 --- a/app/views/projects/_merge_request_settings_description_text.html.haml +++ b/app/views/projects/_merge_request_settings_description_text.html.haml @@ -1 +1 @@ -%p= s_('ProjectSettings|Choose your merge method, merge options, and merge checks.') +%p= s_('ProjectSettings|Choose your merge method, merge options, merge checks, and merge suggestions.') |