projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f74bb1d 7a32271)
Merge branch 'reactions' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 14 Nov 2019 08:47:10 +0000 (08:47 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 14 Nov 2019 08:47:10 +0000 (08:47 +0000)
Emoji Reactions

See merge request pleroma/pleroma!1662

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

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