diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-10 14:55:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-10 14:55:39 +0000 |
| commit | f7537ce03a29b1af85461b2883c33bb41b2382d5 (patch) | |
| tree | 658422c1e0fd693905073f053019ae42c69b9bdb /vendor/gitignore/Android.gitignore | |
| parent | 30e466b56abe595cba4b4c767f707eda351753d5 (diff) | |
| parent | bddbb90fd985df50d4b17d0728ef5fa90bf64af7 (diff) | |
| download | gitlab-ce-f7537ce03a29b1af85461b2883c33bb41b2382d5.tar.gz | |
Merge branch 'issue_39773_be' into 'master'
Prevent fast forward merge when rebase is required
Closes #39773
See merge request gitlab-org/gitlab-ce!15296
Diffstat (limited to 'vendor/gitignore/Android.gitignore')
0 files changed, 0 insertions, 0 deletions