Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 12.10.4 (2020-05-05)
+
+- No changes.
+
 ## 12.10.2 (2020-04-30)
 
 ### Security (3 changes)

CHANGELOG.md

@@ -2,6 +2,13 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.10.4 (2020-05-05)
+
+### Fixed (1 change)
+
+- Add a Project's group to list of groups when parsing for codeowner entries. !30934
+
+
 ## 12.10.2 (2020-04-30)
 
 ### Security (8 changes)

changelogs/unreleased/216345-add-project-group-to-group-list-when-specified-as-owner.yml

----
-title: Add a Project's group to list of groups when parsing for codeowner entries
-merge_request: 30934
-author:
-type: fixed