projects / akkoma / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 06b3bb5) | patch
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Oct 2019 14:12:17 +0000 (17:12 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Oct 2019 14:12:17 +0000 (17:12 +0300)
commitb93856874de673f1c05c557ad482d4480ca7e0a7
tree53ad43d5626ef8019e2372fc07e3260ab4b25d82tree | snapshot
parent06b3bb54c5567fe82ad2a015673fffba667997eecommit | diff
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
18 files changed:
lib/pleroma/web/activity_pub/activity_pub_controller.ex diff | blob | history
lib/pleroma/web/masto_fe_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/app_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/media_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/notification_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/poll_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/report_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/search_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/status_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex diff | blob | history
lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex diff | blob | history
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex diff | blob | history
lib/pleroma/web/router.ex diff | blob | history
lib/pleroma/web/twitter_api/controllers/util_controller.ex diff | blob | history
Fork of https://akkoma.dev/AkkomaGang/akkoma.git