projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46f118d 400fbc7)
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 7 Mar 2020 09:32:29 +0000 (09:32 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 7 Mar 2020 09:32:29 +0000 (09:32 +0000)
Wait in mix task while pleroma is rebooted

See merge request pleroma/pleroma!2225

1  2 
lib/mix/pleroma.ex patch | diff1 | diff2 | blob | history
lib/pleroma/config/transfer_task.ex patch | diff1 | diff2 | blob | history

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