projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cc6359 0d012eb)
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
authorFloatingGhost <hannah@coffee-and-dreams.uk>
Sat, 8 Jan 2022 21:45:12 +0000 (21:45 +0000)
committerFloatingGhost <hannah@coffee-and-dreams.uk>
Sat, 8 Jan 2022 21:45:12 +0000 (21:45 +0000)
1  2 
config/config.exs patch | diff1 | diff2 | blob | history
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history

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