projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9de6145 1e9d152)
Merge branch 'feature/invites' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 12 Aug 2018 12:04:15 +0000 (12:04 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 12 Aug 2018 12:04:15 +0000 (12:04 +0000)
Invites

Closes #108

See merge request pleroma/pleroma!208

1  2 
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/twitter_api/twitter_api.ex patch | diff1 | diff2 | blob | history
test/web/twitter_api/twitter_api_test.exs patch | diff1 | diff2 | blob | history

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