summaryrefslogtreecommitdiff
path: root/app/assets/images/emoji/smirk.png
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-10 22:26:35 +0000
committerStan Hu <stanhu@gmail.com>2019-04-10 22:26:35 +0000
commitdf2396b85c0feacccea42ae4215de9211ab6b86c (patch)
treefc284426386d4534b1699d17897065509a32c367 /app/assets/images/emoji/smirk.png
parentb9e6e72501173c29a30ee1b4a2afb9ee9d3b1117 (diff)
parentfb8908d961174d096aa1e44b3f7b2ca71f4c1c2b (diff)
downloadgitlab-ce-df2396b85c0feacccea42ae4215de9211ab6b86c.tar.gz
Merge branch 'tz-revert-new-emojis-loading' into 'master'
Revert "Merge branch 'tz-reorganise-digests-json' into 'master'" See merge request gitlab-org/gitlab-ce!26156
Diffstat (limited to 'app/assets/images/emoji/smirk.png')
-rw-r--r--app/assets/images/emoji/smirk.pngbin0 -> 775 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/images/emoji/smirk.png b/app/assets/images/emoji/smirk.png
new file mode 100644
index 00000000000..87852109988
--- /dev/null
+++ b/app/assets/images/emoji/smirk.png
Binary files differ