diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:28:47 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:28:47 +0300 |
| commit | edba48c6c4e08b826a9b5267f3b77e3024643214 (patch) | |
| tree | e96015fde0ebd02b9eff4c7da8b31c78cf950ea5 /app/assets/stylesheets/framework | |
| parent | 787b73f5d6dafb3db36a9113a59e3bc5b047a4b9 (diff) | |
| parent | 028592eba6485e574fb0fb42937519b9e8ace37d (diff) | |
Merge branch 'merge-conflicts-icon-color' into 'master'
Use warning color merge conflicts icon in MR status widget.
Fixes #18174
### Before
### After
See merge request !4487
Diffstat (limited to 'app/assets/stylesheets/framework')
0 files changed, 0 insertions, 0 deletions