projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 423ea49 e4c720f)
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
authorlain <lain@soykaf.club>
Wed, 20 May 2020 12:08:28 +0000 (12:08 +0000)
committerlain <lain@soykaf.club>
Wed, 20 May 2020 12:08:28 +0000 (12:08 +0000)
Add OpenAPI spec for EmojiPackController

See merge request pleroma/pleroma!2549

1  2 
docs/API/pleroma_api.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

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