diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-17 11:56:59 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-17 11:56:59 -0400 |
commit | 7901126b638a173a2d9752473e799417444466a7 (patch) | |
tree | 3b9afcd4d4dc982899bd9506df759eb64cc75de3 /web/templates | |
parent | de64bd19d5a9811ee2539baa8fdb61c4ece57378 (diff) | |
parent | 99d0db136cfaa88cf654c77e30fd1867136db9d5 (diff) | |
download | chat-7901126b638a173a2d9752473e799417444466a7.tar.gz chat-7901126b638a173a2d9752473e799417444466a7.tar.bz2 chat-7901126b638a173a2d9752473e799417444466a7.zip |
Merge pull request #701 from mattermost/PLT-40
PLT-40 adding experimental support for emojis
Diffstat (limited to 'web/templates')
-rw-r--r-- | web/templates/head.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index dcd643b58..af5c86bba 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -40,6 +40,10 @@ <script src="/static/js/jquery-dragster/jquery.dragster.js"></script> + <script src="/static/js/emojify.min.js"></script> + <script> + emojify.setConfig({img_dir: '/static/images/emoji'}); + </script> <style id="antiClickjack">body{display:none !important;}</style> <script src="/static/js/bundle.js"></script> |