Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex		2019-09-19 10:59:09 +03:00
..
controllers	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-09-19 10:59:09 +03:00
views	Merge branch 'chores/bump-copyright-year' into 'develop'	2019-09-18 21:57:49 +00:00
mastodon_api_controller_test.exs	Fix a race condition in tests	2019-09-16 12:55:05 +07:00
mastodon_api_test.exs	Remove most of Pleroma.Web.TwitterAPI.TwitterAPI	2019-08-31 10:20:34 +03:00