Merge master (rebase being super annoying). Fix conflicts
plugins/emoji/README.md
0 → 100644
This diff is collapsed.
plugins/emoji/emoji-data.txt
0 → 100644
This diff is collapsed.
Please register or sign in to comment