Automatic merge of gitlab-org/gitlab-ce master

7eb37baf · GitLab Bot · c6de49fb · 134df14c · 7eb37baf · 7eb37baf
Commit 7eb37baf authored Mar 21, 2019 by GitLab Bot
2 changed files
--- a/changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml
+++ b/changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml
+---
+title: Add missing .gitlab-ci.yml to Android template
+merge_request: 26415
+author:
+type: fixed
--- a/vendor/project_templates/android.tar.gz
+++ b/vendor/project_templates/android.tar.gz