projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2286f62 da17bdd)
Merge branch 'release/1.0' into 'develop'
authorlain <lain@soykaf.club>
Fri, 28 Jun 2019 15:29:44 +0000 (15:29 +0000)
committerlain <lain@soykaf.club>
Fri, 28 Jun 2019 15:29:44 +0000 (15:29 +0000)
1.0 Release

See merge request pleroma/pleroma!1348

1  2 
mix.exs patch | diff1 | diff2 | blob | history

diff --cc mix.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git