diff options
| author | Corey Hulen <corey@hulen.com> | 2015-09-14 16:57:54 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-09-14 16:57:54 -0700 |
| commit | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (patch) | |
| tree | f2f62d288f8e3e322d4e33bb22104e433098c336 /web/templates | |
| parent | c447db6e78df1307d2d1245acdd791de6d79716a (diff) | |
| parent | 0ea0233c50dbccc498cb53481b9fdf18d027e5b2 (diff) | |
| download | chat-bfebb41bc0c0a1c5f481617f912bdf6dd483c341.tar.gz chat-bfebb41bc0c0a1c5f481617f912bdf6dd483c341.tar.bz2 chat-bfebb41bc0c0a1c5f481617f912bdf6dd483c341.zip | |
Merge pull request #678 from mattermost/mm-1589
PLT-171 MM-1589 New add channel modal using react-bootstrap.
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/head.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index 76ee70ced..55c729476 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -18,12 +18,13 @@ <link rel="manifest" href="/static/config/manifest.json"> <!-- Android add to homescreen --> - <link rel="stylesheet" href="/static/css/bootstrap-3.3.1.min.css"> + <link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css"> <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet"> - <script src="/static/js/react-with-addons-0.13.1.js"></script> + <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/bootstrap-3.3.1.js"></script> + <script src="/static/js/bootstrap-3.3.5.js"></script> + <script src="/static/js/react-bootstrap-0.25.1.js"></script> <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"> |