Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake...
authorlain <lain@soykaf.club>
Tue, 31 Mar 2020 17:06:08 +0000 (19:06 +0200)
committerlain <lain@soykaf.club>
Tue, 31 Mar 2020 17:06:08 +0000 (19:06 +0200)
commit51fc504705c1ab337b1202d6e407a9578e67a9e9
tree53f99872fba7704427d7370dcda3e1f4fc146162
parent057438a657eaadb963e006b84b890ae4f8441808
parent288f2b5a7c728959d43205a97d5225b34b5b8161
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2