twitterapi: fix bad rebase
authorWilliam Pitcock <nenolod@dereferenced.org>
Sat, 1 Dec 2018 23:08:23 +0000 (23:08 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Tue, 4 Dec 2018 04:52:09 +0000 (04:52 +0000)
commit02288b5f1cd428c12f92b9ea4fb0b0a935bbdaaf
treeda75ad7bf6bbea1fde3d4bf37582dd45fbe124e9
parentf0439617ef233c150bd3e9dff620b47cfb1f8895
twitterapi: fix bad rebase
lib/pleroma/web/twitter_api/views/activity_view.ex