projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd45cab b4da2bc)
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
authorlambda <lain@soykaf.club>
Mon, 8 Apr 2019 11:42:20 +0000 (11:42 +0000)
committerlambda <lain@soykaf.club>
Mon, 8 Apr 2019 11:42:20 +0000 (11:42 +0000)
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019

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