Merge remote-tracking branch 'origin/issue/55953' into issue/55953

# Conflicts: # locale/gitlab.pot # spec/features/discussion_comments/commit_spec.rb

Merge remote-tracking branch 'origin/issue/55953' into issue/55953
# Conflicts: # locale/gitlab.pot # spec/features/discussion_comments/commit_spec.rb
83330822 · Michel Engelen · f02544a9 · 60797e9e · 83330822
Commit 83330822 authored Jul 02, 2019 by Michel Engelen
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

locale/gitlab.pot locale/gitlab.pot +6 -0

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -11096,6 +11096,9 @@ msgstr ""
 msgid "Toggle thread"
 msgstr ""

+msgid "Toggle thread"
+msgstr ""
+
 msgid "ToggleButton|Toggle Status: OFF"
 msgstr ""

@@ -11309,6 +11312,9 @@ msgstr ""
 msgid "Unresolve thread"
 msgstr ""

+msgid "Unresolve thread"
+msgstr ""
+
 msgid "Unschedule job"
 msgstr ""