diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-22 13:33:18 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-22 13:33:18 -0400 |
| commit | e9a2c223f2f247a773d04c4c23417393ca75b3dc (patch) | |
| tree | 06a1ffa6312e7337b8af29aa76a1389c4f7e8666 /web | |
| parent | 7c0388856d811521064d2bd4d1e39976ba806906 (diff) | |
| parent | 6beadc0319d7fd58fb521fd3713a6a46cea8f3d1 (diff) | |
| download | chat-e9a2c223f2f247a773d04c4c23417393ca75b3dc.tar.gz chat-e9a2c223f2f247a773d04c4c23417393ca75b3dc.tar.bz2 chat-e9a2c223f2f247a773d04c4c23417393ca75b3dc.zip | |
Merge pull request #747 from mattermost/revert-742-plt289
Revert "PLT-289 Properly removed lingering references to emojify"
Diffstat (limited to 'web')
| -rw-r--r-- | web/templates/head.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index a3ac930e9..af5c86bba 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -40,6 +40,11 @@ <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> <script type="text/javascript"> |