projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cc6cb2 aa718ab)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 7 Aug 2019 07:59:31 +0000 (08:59 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 7 Aug 2019 07:59:31 +0000 (08:59 +0100)
1  2 
lib/mix/tasks/pleroma/user.ex patch | diff1 | diff2 | blob | history
priv/static/emoji/sheet_10.png patch | blob1 | blob2 | history

diff --cc lib/mix/tasks/pleroma/user.ex
Simple merge
diff --cc priv/static/emoji/sheet_10.png
index 3ee92a1f10a132005285825cc0168f5c48032a07,3ee92a1f10a132005285825cc0168f5c48032a07..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ
Fork of https://akkoma.dev/AkkomaGang/akkoma.git