projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 743bd64 55742d9)
Merge branch 'develop' into release-docs
authorrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 23:00:18 +0000 (02:00 +0300)
committerrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 23:00:18 +0000 (02:00 +0300)
1  2 
lib/mix/tasks/pleroma/instance.ex patch | diff1 | diff2 | blob | history

diff --cc lib/mix/tasks/pleroma/instance.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git