projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d29a50 756bdef)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 25 Nov 2019 11:37:49 +0000 (11:37 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 25 Nov 2019 11:37:49 +0000 (11:37 +0000)
1  2 
lib/mix/tasks/pleroma/user.ex patch | diff1 | diff2 | blob | history

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