diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-06-12 13:17:21 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-06-12 13:17:21 +0000 |
| commit | 4d8d1fa129b5f8692311de211203bc18c614951f (patch) | |
| tree | e9a1130c9a9e5a5b8babd2ba3153e4ed03a4581e /public | |
| parent | 34f1fd2a621ca869c17009487e2f10063812fbd0 (diff) | |
| parent | 6151308c47efb0e05bcb2c54aa1693f5ff04da5c (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'public')
| -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 |
