projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1056aa 42ff5ea)
Merge branch 'revert-da4660d2' into 'develop'
authorfeld <feld@feld.me>
Wed, 18 Nov 2020 21:16:12 +0000 (21:16 +0000)
committerfeld <feld@feld.me>
Wed, 18 Nov 2020 21:16:12 +0000 (21:16 +0000)
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

See merge request pleroma/pleroma!3158


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