Commit 14133a9a authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android into develop

parents 2aeb9ed5 625dbcaf
Your Rocket.Chat.Android version: (make sure you are running the latest)
<!-- Version can be found by opening the side menu and then clicking on the chevron alongside username -->
<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
<!-- Don't forget to list the steps to reproduce. Stack traces may help too :) -->
......@@ -80,6 +80,7 @@ public class MessageRenderer extends AbstractRenderer<Message> {
break;
case SyncState.FAILED:
textView.setText(R.string.failed_to_sync);
break;
default:
textView.setText(DateTime.fromEpocMs(object.getTimestamp(), DateTime.Format.TIME));
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment