Merge branch 'admin-logo-upload' into 'develop'
authorlain <lain@soykaf.club>
Thu, 21 May 2020 14:30:34 +0000 (14:30 +0000)
committerlain <lain@soykaf.club>
Thu, 21 May 2020 14:30:34 +0000 (14:30 +0000)
commitab1154e13fece4ca552deaf5c62030c826c09760
tree88c27719adecc959d7741b44fe06117c456e1abb
parenta42a0716ec769dfbd97505b6c872c5ea1a8f800a
parentb7fc61e17b995e3aa4e52f85b91d320a1cd1e106
Merge branch 'admin-logo-upload' into 'develop'

Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image

See merge request pleroma/pleroma!2388
lib/pleroma/user.ex