Merge remote-tracking branch 'origin/main' into emoji13-1

# Conflicts:
#	Dockerfile
#	svg/emoji_u1f97a.svg
This commit is contained in:
Constantin A 2021-07-15 10:53:50 +02:00
commit ad30eb0ae9
2 changed files with 6 additions and 1 deletions

View file

@ -1,5 +1,8 @@
Dockerfile
.dockerignore
add_emoji_gsub.pyc
build
waveflag
.git/
fonts/

View file

@ -102,6 +102,8 @@ _First of all, this licensing is used for this project too to avoid any confusio
_Note: On this fork you can simply send pull requests or issues. I'll try to respond as soon as possible._
_Please try to use the discussion feature for artistic topics, like the style of the emojis. Issues are better suited for real issues, like not being able to use the font or really **missing** characters, etc._
## News
* _2018-02-03: Blobmoji Fork created_
* 2017-09-13: Emoji redesign released.