diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:04:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:04:04 +0000 |
| commit | aa285f422940feec6c77bf8f3332fc83651211b8 (patch) | |
| tree | d1c7dccf735242cbbc8a222bdfd8a0182aee7dc5 /lib/api/files.rb | |
| parent | b6a315d099b978713c1d69eb1bc8ca43883cf119 (diff) | |
| parent | 1e1f99f2b1b3d79f4b767362fbf8fe1838348175 (diff) | |
| download | gitlab-ce-aa285f422940feec6c77bf8f3332fc83651211b8.tar.gz | |
Merge branch '53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master'
Update gitlab-markup gem to avoid binary name collision
Closes #53082
See merge request gitlab-org/gitlab-ce!22960
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions