Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate...
authorlain <lain@soykaf.club>
Tue, 20 Nov 2018 19:16:16 +0000 (20:16 +0100)
committerlain <lain@soykaf.club>
Tue, 20 Nov 2018 19:16:16 +0000 (20:16 +0100)
1  2 
lib/pleroma/user.ex

Simple merge