diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-05-31 11:28:48 +0200 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-31 11:28:48 +0200 |
| commit | d363014c36708864df09f39cb64415073a1430a0 (patch) | |
| tree | fbd3332dcf41a518c390b07d3bdcc7bef2cfdbec /changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml | |
| parent | b4308842deb79c1364302188a41c6e37c14b62ec (diff) | |
| parent | 5b9edea9f16d57ef82f4a69eacd91c13d068583d (diff) | |
| download | gitlab-ce-d363014c36708864df09f39cb64415073a1430a0.tar.gz | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
# Conflicts:
# app/controllers/projects/clusters/gcp_controller.rb
# app/views/projects/clusters/gcp/_form.html.haml
# app/views/projects/clusters/gcp/login.html.haml
Diffstat (limited to 'changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml')
| -rw-r--r-- | changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml b/changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml new file mode 100644 index 00000000000..e6dc9a6187b --- /dev/null +++ b/changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml @@ -0,0 +1,5 @@ +--- +title: Update awesome_print to 1.8.0 +merge_request: 19163 +author: Takuya Noguchi +type: other |