diff options
author | Regis <boudinot.regis@yahoo.com> | 2017-06-08 05:22:10 +0300 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-06-08 05:22:10 +0300 |
commit | 17173d189587cf59692c9ff8a14c155118e941c2 (patch) | |
tree | 089d9313c71ed6eb3f0de1d9049e855d21beed13 /changelogs | |
parent | dcf622937bab0ca068603eece410a18c9d1ca25d (diff) | |
parent | 14e64d29661e5a25242f7c1c65d080facc5b3b8d (diff) |
Merge remote-tracking branch 'gl-dev/master'
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/32715-fix-note-padding.yml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/zj-fix-pipeline-etag.yml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/changelogs/unreleased/32715-fix-note-padding.yml b/changelogs/unreleased/32715-fix-note-padding.yml deleted file mode 100644 index 867ed7eb171..00000000000 --- a/changelogs/unreleased/32715-fix-note-padding.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Make all notes use equal padding -merge_request: -author: diff --git a/changelogs/unreleased/zj-fix-pipeline-etag.yml b/changelogs/unreleased/zj-fix-pipeline-etag.yml deleted file mode 100644 index 03ebef8c575..00000000000 --- a/changelogs/unreleased/zj-fix-pipeline-etag.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fix issue where real time pipelines were not cached -merge_request: 11615 -author: |