diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-08 19:31:21 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-08 19:31:21 +0300 |
| commit | 0abd8578dde34e9e2b7ff4ccda746db93a2930ee (patch) | |
| tree | 32f5d3913a96c4f25f7dfb2aa67c9366bce76f10 /app/assets/javascripts/merge_conflicts | |
| parent | ebdc7f11d9c1a2a492e4af6918d407882ce5737d (diff) | |
| parent | 45053bb34cfe227255cb6c0ed954b64ffd788c52 (diff) | |
Merge branch '47519-discussion-padding' into 'master'
Resolve "discussion has a weird margin around it"
Closes #47519 and #47507
See merge request gitlab-org/gitlab-ce!19569
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
0 files changed, 0 insertions, 0 deletions