projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48f68fd a825056)
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
authorlambda <lain@soykaf.club>
Fri, 26 Apr 2019 11:59:47 +0000 (11:59 +0000)
committerlambda <lain@soykaf.club>
Fri, 26 Apr 2019 11:59:47 +0000 (11:59 +0000)
Feature/807 bookmark endpoint extension

Closes #807

See merge request pleroma/pleroma!1059

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex patch | diff1 | diff2 | blob | history
test/web/mastodon_api/mastodon_api_controller_test.exs patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git