mirrors/akkoma
1
0
Fork 1
mirror of https://github.com/jtomchak/akkoma.git synced 2025-01-20 06:36:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6945 commits 1 branch 0 tags 271 MiB
Commit graph

2 commits

Author SHA1 Message Date
Ivan Tashkinov
64095961fe [#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
 2019-10-02 20:42:40 +03:00
Egor Kislitsyn
a66a7a328f Extract notification actions from MastodonAPIController into NotificationController 2019-09-24 15:16:44 +07:00