projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 52b1b0e 9b90869)
Merge branch 'update/phoenix-and-plug' into 'develop'
authorlain <lain@soykaf.club>
Sat, 15 Jun 2019 15:09:14 +0000 (15:09 +0000)
committerlain <lain@soykaf.club>
Sat, 15 Jun 2019 15:09:14 +0000 (15:09 +0000)
Update Phoenix

See merge request pleroma/pleroma!1290


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