projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae4fc58 fe548f3)
Merge branch 'develop' into feature/digest-email
authorRoman Chvanikov <chvanikoff@pm.me>
Sat, 20 Jul 2019 13:41:58 +0000 (16:41 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Sat, 20 Jul 2019 13:41:58 +0000 (16:41 +0300)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history

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