Fix merge.
authorlain <lain@soykaf.club>
Wed, 5 Dec 2018 20:31:02 +0000 (21:31 +0100)
committerlain <lain@soykaf.club>
Wed, 5 Dec 2018 20:31:02 +0000 (21:31 +0100)
commit7d5720f2e40015502fe646b86768ab8454f571fe
tree5c2932200859525b8e245f671b0cdc25ca56bfd4
parent76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed
Fix merge.
lib/pleroma/user/info.ex