projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf3afbc 7c06043)
Merge branch 'revert-13a7105b' into 'develop'
authorlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:31:41 +0000 (16:31 +0000)
committerlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:31:41 +0000 (16:31 +0000)
Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383


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