git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d37d410 92efdf9)

author	feld <feld@feld.me>
	Tue, 2 Feb 2021 18:35:08 +0000 (18:35 +0000)
committer	feld <feld@feld.me>
	Tue, 2 Feb 2021 18:35:08 +0000 (18:35 +0000)
commit	f1f773f2c76b877f372767963a35c8e827f8d6e6
tree	f2ed7d6f2681af143a9d78e575209240206582f3	tree \| snapshot
parent	d37d4106c627e0d3a06765c5b46da40cb8ac41fe	commit \| diff
parent	92efdf9adc5d061e0bb008d75dae67b1ae80b834	commit \| diff

Merge branch 'email-stub-in-verify-credentials' into 'develop'

Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)

See merge request pleroma/pleroma!3286

CHANGELOG.md	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	diff1 \|	diff2 \|	blob \| history
test/pleroma/user_test.exs	diff1 \|	diff2 \|	blob \| history

Fork of https://akkoma.dev/AkkomaGang/akkoma.git