projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7202b5 99b4847)
Merge branch 'iss-930-media' into 'develop'
authorfeld <feld@feld.me>
Fri, 30 Aug 2019 15:23:15 +0000 (15:23 +0000)
committerfeld <feld@feld.me>
Fri, 30 Aug 2019 15:23:15 +0000 (15:23 +0000)
Fix missing changes in pleroma/pleroma!1197

See merge request pleroma/pleroma!1613


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git