diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
| commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
| tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /web/templates/head.html | |
| parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
| parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
| download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip | |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'web/templates/head.html')
| -rw-r--r-- | web/templates/head.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index e4f1b56b3..3466510d4 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -32,12 +32,13 @@ <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon"> - <script src="/static/js/react-with-addons-0.13.3.js"></script> - <script src="/static/js/jquery-1.11.1.js"></script> + <script src="/static/js/react-0.14.0.js"></script> + <script src="/static/js/react-dom-0.14.0.js"></script> + <script src="/static/js/jquery-2.1.4.js"></script> <script src="/static/js/bootstrap-3.3.5.js"></script> <script src="/static/js/bootstrap-colorpicker.min.js"></script> - <script src="/static/js/react-bootstrap-0.25.1.js"></script> - <script src="/static/js/perfect-scrollbar-0.6.5.jquery.min.js"></script> + <script src="/static/js/react-bootstrap-0.27.1.js"></script> + <script src="/static/js/perfect-scrollbar-0.6.7.jquery.min.js"></script> <script src="/static/js/jquery-dragster/jquery.dragster.js"></script> <style id="antiClickjack">body{display:none !important;}</style> |