Files
gitlabhq/app/views/projects
Jacob Schatz edba48c6c4 Merge branch 'merge-conflicts-icon-color' into 'master'
Use warning color merge conflicts icon in MR status widget.

Fixes #18174 

### Before
![Screen_Shot_2016-06-06_at_18.00.56](/uploads/4a74b1710478daee5ee95b7c6b6a835f/Screen_Shot_2016-06-06_at_18.00.56.png)

### After
![Screen_Shot_2016-06-06_at_17.58.04](/uploads/28faefaebef30e4256390029c87b28bb/Screen_Shot_2016-06-06_at_17.58.04.png)

See merge request !4487
2016-06-09 20:28:47 +00:00
..
2016-06-07 09:08:15 -05:00
2016-06-07 15:02:00 +01:00
2016-06-07 09:08:15 -05:00
2016-06-07 09:08:15 -05:00
2016-04-25 16:56:17 +01:00
2016-06-09 17:19:14 +01:00
2016-06-07 09:08:15 -05:00
2016-06-07 09:08:15 -05:00
2016-05-26 09:15:56 +01:00
2016-06-07 09:08:15 -05:00
2016-06-07 08:59:40 -05:00
2016-05-16 10:26:11 +01:00
2016-06-07 10:05:10 -05:00
2016-04-13 15:58:22 +02:00
2016-05-04 16:45:37 -05:00
2016-05-04 16:45:37 -05:00
2016-05-20 08:49:31 +01:00
2016-05-23 12:37:40 -04:00
2015-02-14 11:09:23 -07:00