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
..
2013-05-06 08:40:55 -07:00
2013-05-06 08:40:55 -07:00
2012-07-31 13:53:00 -07:00
2013-06-21 12:14:40 -07:00
2013-12-01 01:36:21 +02:00
2015-01-21 19:01:23 -10:00
2014-01-25 23:39:56 -08:00