projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a2d370 1857f40)
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 8 Apr 2018 06:02:11 +0000 (06:02 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 8 Apr 2018 06:02:11 +0000 (06:02 +0000)
mastodon api emulation improvements for tootstream

Closes #101

See merge request pleroma/pleroma!100

1  2 
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git