Jake McGinty ac0a1c0bc1 Conflicts UI touch-ups:
1) Fix i18n and layout naming.
2) Error header for message details.
3) Add back button to message details.

// FREEBIE

Closes #2593
2015-02-27 12:26:35 -08:00
..
2015-01-21 19:01:23 -10:00
2014-04-01 14:56:45 -07:00
2015-02-27 12:26:35 -08:00