diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 02:42:42 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 02:42:42 +0000 |
| commit | 4371f845649deaf6bf31f0a675b33f1d58f64de4 (patch) | |
| tree | 618c2380d57d662826e185997d4663f29ca2c0bf /app/models/instance_configuration.rb | |
| parent | 1f233e3394db1beae885959c34377aa848f46e42 (diff) | |
| parent | 7ec5d320f33d46d47a28c3ec7d755a6d42bbd08b (diff) | |
| download | gitlab-ce-4371f845649deaf6bf31f0a675b33f1d58f64de4.tar.gz | |
Merge branch 'remove-merge-conflicts-bundle' into 'master'
Remove merge_conflicts bundle
See merge request gitlab-org/gitlab-ce!17408
Diffstat (limited to 'app/models/instance_configuration.rb')
0 files changed, 0 insertions, 0 deletions