projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 917d325 c5acbf8)
Merge branch 'develop' into issue/2099
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 17 Sep 2020 05:41:35 +0000 (08:41 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 17 Sep 2020 05:41:35 +0000 (08:41 +0300)
1  2 
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history
test/user_test.exs patch | diff1 | diff2 | blob | history

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