projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2be142e 83663ca)
Merge branch 'ueberauth_config_extension' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 4 Jun 2019 05:42:49 +0000 (05:42 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 4 Jun 2019 05:42:49 +0000 (05:42 +0000)
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification

See merge request pleroma/pleroma!1234

1  2 
config/config.exs patch | diff1 | diff2 | blob | history
docs/config.md patch | diff1 | diff2 | blob | history

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