projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2dcd76 3dbd980)
Merge branch 'feature/lists' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 24 May 2018 20:22:43 +0000 (20:22 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 24 May 2018 20:22:43 +0000 (20:22 +0000)
Mastodon List API

See merge request pleroma/pleroma!138

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
test/web/mastodon_api/mastodon_api_controller_test.exs patch | diff1 | diff2 | blob | history

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