projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16e598e f8aa917)
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 2 Apr 2019 08:41:30 +0000 (15:41 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 2 Apr 2019 08:41:30 +0000 (15:41 +0700)
1  2 
lib/mix/tasks/pleroma/user.ex patch | diff1 | diff2 | blob | history
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history

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