Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock		2018-12-06 19:55:58 +07:00
..
controllers	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
representers	twitterapi: activity view: add the other in_reply_to fields	2018-10-25 04:04:04 +00:00
views	Twitter API: Fall back to user.nickname if user has no name	2018-11-12 15:52:13 +00:00
twitter_api.ex	Runtime configuration	2018-11-06 19:41:15 +01:00
twitter_api_controller.ex	TwitterAPI: Fix dm_timeline displaying only half of the conversation.	2018-11-16 19:47:36 +01:00