projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83a9ec2 fee1276)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 4 Nov 2019 18:20:19 +0000 (18:20 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 4 Nov 2019 18:20:19 +0000 (18:20 +0000)
1  2 
mix.exs patch | diff1 | diff2 | blob | history

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