projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a42a071 b7fc61e)
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)
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image

See merge request pleroma/pleroma!2388

1  2 
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/user.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git