merge develop & resolve conflict

This commit is contained in:
dave 2019-03-29 10:11:28 -04:00
commit 783cc00dd0
28 changed files with 695 additions and 236 deletions

View file

@ -177,6 +177,7 @@ export const parseStatus = (data) => {
output.in_reply_to_status_id = data.in_reply_to_id
output.in_reply_to_user_id = data.in_reply_to_account_id
output.replies_count = data.replies_count
// Missing!! fix in UI?
// output.in_reply_to_screen_name = ???