Rebase on master, resolve readme merge conflict

This commit is contained in:
Seirdy 2024-03-02 21:29:53 -05:00
parent 3a555ad55f
commit e0b3e6ee73
No known key found for this signature in database
GPG key ID: 1E892DB2A5F84479

View file

@ -58,6 +58,19 @@ includes also emojis from:
- bubblegum: <https://ko-fi.com/emotecafe/> - bubblegum: <https://ko-fi.com/emotecafe/>
- celeste hearts: <https://github.com/mecha-cat/celeste-hearts> - celeste hearts: <https://github.com/mecha-cat/celeste-hearts>
- Jinx: <https://www.deviantart.com/blazz777/art/FREE-Jinx-emote-pack-download-899692448> - Jinx: <https://www.deviantart.com/blazz777/art/FREE-Jinx-emote-pack-download-899692448>
- Pochita: <https://ko-fi.com/ladykamimi/>
- Neorat: <https://lalafell.party/neorat.html>
- Pinkiemme: <https://pinkiemme.gumroad.com/>
- Yingmotes (ying palette): <https://github.com/Mynotaurus/Yingmotes>
- Akemi: <https://github.com/Aircoookie/Akemi>
- Hatsune Miku: <https://aquaspider.gumroad.com/>
- Eeveelutions: <https://aquaspider.gumroad.com/>
- cute_frog: <https://rosarrie.gumroad.com/>
- RWBY: <https://howelixir.gumroad.com/>
- Hollow Knight: <https://sleepytealeaf.gumroad.com/>
- Gamer: <https://kreativ31.gumroad.com/>
- Netfish: <https://ibbbon.gumroad.com/>
- Alpaca: <https://rosarrie.gumroad.com/>
#### notice #### notice