Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-05

# Conflicts: # CHANGELOG.md [ci skip]

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-05
# Conflicts: # CHANGELOG.md [ci skip]
7ae62fc0 · GitLab Bot · ef250e65 · 93846eb1 · 7ae62fc0
Commit 7ae62fc0 authored Nov 05, 2018 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CHANGELOG.md CHANGELOG.md +5 -0

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,14 @@ entry.

 ## 11.4.5 (2018-11-04)

+<<<<<<< HEAD
 ### Fixed (5 changes, 1 of them is from the community)

 - Fix stuck job warning message. !8060
+=======
+### Fixed (4 changes, 1 of them is from the community)
+
+>>>>>>> upstream/master
 - fix link to enable usage ping from convdev index. !22545 (Anand Capur)
 - Update gitlab-ui dependency to 1.8.0-hotfix.1 to fix IE11 bug.
 - Remove duplicate escape in job sidebar.