You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		5 years ago
..
controllers	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	5 years ago
views	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
mastodon_api_controller_test.exs	Move `:favourites` and `:bookmarks` actions to StatusController	5 years ago
mastodon_api_test.exs	Revert subscription refactoring.	5 years ago