diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2017-12-11 16:27:39 +0000 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2017-12-11 16:27:39 +0000 |
commit | 40d404a6358a52eaee12feb5d43404de281d57ce (patch) | |
tree | 6690f626e2a719923300d848e3ad09bf3cee3f68 /Gemfile | |
parent | 3daa7331397d0b565911d5bb67b2411b021136fa (diff) | |
download | gitlab-ce-40d404a6358a52eaee12feb5d43404de281d57ce.tar.gz |
Resolve merge conflicts with dev.gitlab.org/master after security release
Diffstat (limited to 'Gemfile')
0 files changed, 0 insertions, 0 deletions