diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-12 18:13:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 18:13:30 -0500 |
| commit | 5cff053944b4327477ca45882c9dd3b1a7a559e8 (patch) | |
| tree | 83c564879534ea35f468ce319342e011773f24aa /public/emoji | |
| parent | 99b2bc2668e79bacd7f8696315206872086ebf3a (diff) | |
| parent | f6bb50b6ece555af138df164680189b1ec57da4b (diff) | |
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
Diffstat (limited to 'public/emoji')
| -rw-r--r-- | public/emoji/sheet.png | bin | 3071758 -> 0 bytes |
| -rw-r--r-- | public/emoji/sheet_10.png | bin | 0 -> 858920 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/public/emoji/sheet.png b/public/emoji/sheet.png deleted file mode 100644 index e9a3f23f8..000000000 --- a/public/emoji/sheet.png +++ /dev/null Binary files differdiff --git a/public/emoji/sheet_10.png b/public/emoji/sheet_10.png new file mode 100644 index 000000000..3ee92a1f1 --- /dev/null +++ b/public/emoji/sheet_10.png Binary files differ |
