Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex		2018-12-06 20:15:16 +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	Several twitter api fixes.	2018-11-18 22:36:47 +01:00
twitter_api.ex	[#210] Mastodon: actor storing for media uploads, ownership check to update_media.	2018-12-06 10:26:17 +03:00
twitter_api_controller.ex	Merge branch '210_twitter_api_uploads_alt_text' into 'develop'	2018-12-06 07:36:21 +00:00