projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 072e965 4257f78)
Merge branch 'nil-bio-emojis' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 05:54:11 +0000 (05:54 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 05:54:11 +0000 (05:54 +0000)
add nil clause for Formatter.get_emoji/1 to return an empty result

Closes #274

See merge request pleroma/pleroma!315

1  2 
lib/pleroma/formatter.ex patch | diff1 | diff2 | blob | history
test/formatter_test.exs patch | diff1 | diff2 | blob | history

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