Skip to content

Commit 2eb38f8

Browse files
author
Constantin A
committed
Merge remote-tracking branch 'origin/main' into emoji15
# Conflicts: # fonts/Blobmoji.ttf # fonts/BlobmojiCompat.ttf # fonts/BlobmojiWindows.ttf # fonts/BlobmojiWindowsDefaultReplacement.ttf
2 parents 07fe114 + d0c143d commit 2eb38f8

12 files changed

+7
-7
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ I am **neither** affiliated nor in _any_ relationship to the original creators o
66

77
This repository is intended to continue the development of the Blob emojis which have been replaced by different designs in 2017.
88

9-
Please note that I did not create most of the emojis. You can find an overview of the changes I made in the file `CHANGED.md`
9+
Please note that I did not create most of the emojis. You can find an overview of the changes I made in the file `MODIFIED.md`
1010

1111
Most information on this fork will be included in the [Wiki](https://github.com/C1710/blobmoji/wiki). There you'll find more detailed build instructions and other helpful information on how to use this font and much more.
1212

@@ -50,7 +50,7 @@ Tools and most image resources are under the [Apache license, version 2.0](./LIC
5050
Flag images under third_party/region-flags are in the public domain or
5151
otherwise exempt from copyright ([more info](third_party/region-flags/LICENSE)).
5252

53-
This license also applies to this repository
53+
This license also applies to this repository.
5454

5555
# Contributing
5656

svg/emoji_u1f574_1f3fb.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

svg/emoji_u1f574_1f3fc.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

svg/emoji_u1f574_1f3fd.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

svg/emoji_u1f574_1f3fe.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

svg/emoji_u1f574_1f3ff.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)