diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:27:12 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:27:12 -0400 |
| commit | bdd0cfd227840d55e0f0f42562135531164152bf (patch) | |
| tree | 8aa1de407b051df1145bff12e7d475caf4788146 /web/templates/head.html | |
| parent | 0391e5fe96d922f1e4a6ca2418a871ba1e88c9d2 (diff) | |
| parent | 55f11ba8719d133103bc1d4779bb8cb66d591b58 (diff) | |
| download | chat-bdd0cfd227840d55e0f0f42562135531164152bf.tar.gz chat-bdd0cfd227840d55e0f0f42562135531164152bf.tar.bz2 chat-bdd0cfd227840d55e0f0f42562135531164152bf.zip | |
Merge pull request #751 from hmhealey/plt344
PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
Diffstat (limited to 'web/templates/head.html')
| -rw-r--r-- | web/templates/head.html | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index af5c86bba..a3ac930e9 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -40,11 +40,6 @@ <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"> |