Merge branch 'jramsay/fix-mirroring-help-text-typo' into 'master'

Fix mirroring help text

See merge request gitlab-org/gitlab-ce!31348

app/views/projects/mirrors/_instructions.html.haml

@@ -2,7 +2,7 @@
   %ul
     %li
       = _('The repository must be accessible over <code>http://</code>,
-      <code>https://</code>, <code>ssh://</code> and <code>git://</code>.').html_safe
+      <code>https://</code>, <code>ssh://</code> or <code>git://</code>.').html_safe
     %li= _('Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>.').html_safe
     %li
       - minutes = Gitlab.config.gitlab_shell.git_timeout / 60

changelogs/unreleased/jramsay-fix-mirroring-help-text-typo.yml

+---
+title: Fix mirroring help text
+merge_request: 31348
+author: jramsay
+type: other

locale/gitlab.pot

@@ -10975,7 +10975,7 @@ msgstr ""
 msgid "The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>."
 msgstr ""
 
-msgid "The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> and <code>git://</code>."
+msgid "The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> or <code>git://</code>."
 msgstr ""
 
 msgid "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request."