fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-14 11:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7120 commits 26 branches 107 tags 316 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
rinpatch 6b3d5ed6db Emoji API Controller: Follow phoenix directory structure 2019-09-23 21:14:51 +03:00
Renamed from lib/pleroma/web/pleroma_api/pleroma_api_controller.ex (Browse further)