kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

# Conflicts:
#	locale/gitlab.pot
#	spec/features/discussion_comments/commit_spec.rb
This commit is contained in:
Michel Engelen 2019-07-02 14:31:22 +02:00
parent f02544a9bb 60797e9eff
commit 83330822d6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
locale/gitlab.pot
View File

@ -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 ""