projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02a2f25 70951d0)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 1 Aug 2020 18:32:31 +0000 (19:32 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 1 Aug 2020 18:32:31 +0000 (19:32 +0100)
1  2 
.gitignore patch | diff1 | diff2 | blob | history
config/config.exs patch | diff1 | diff2 | blob | history
lib/mix/tasks/pleroma/user.ex patch | diff1 | diff2 | blob | history

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