diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 20:35:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 20:35:36 +0000 |
| commit | 5fb5fd253a960ed33eebc0f6aabeae37aa175fa8 (patch) | |
| tree | 2cf0d33900391e272fd2ded9f17b4d5af713f441 /lib/api | |
| parent | c5eb2977d7750a6f3255941f72a1002259468834 (diff) | |
| parent | ab6aa8a48bbee2b62a2ddc0a2a7807109d814f0a (diff) | |
| download | gitlab-ce-5fb5fd253a960ed33eebc0f6aabeae37aa175fa8.tar.gz | |
Merge branch 'nicer-merge-conflicts-widget' into 'master'
Split merge conflict messages on 2 lines
Before
After
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1107
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions