summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-09 11:54:14 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-09 11:54:14 -0400
commita0febe2f3156ceb02635d9ecd5124da49c494161 (patch)
tree84acf0bf39eded4dd6a58059251864cc8b2da284 /web
parentb67bb7e6fe29aa39f5b2976b1ca1f119f459d4c1 (diff)
parent12cd7c03d6676466f7b10b8e80b4e05edab0cf2a (diff)
downloadchat-a0febe2f3156ceb02635d9ecd5124da49c494161.tar.gz
chat-a0febe2f3156ceb02635d9ecd5124da49c494161.tar.bz2
chat-a0febe2f3156ceb02635d9ecd5124da49c494161.zip
Merge branch 'release-1.1.0'
Diffstat (limited to 'web')
-rw-r--r--web/templates/head.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/templates/head.html b/web/templates/head.html
index 8039f48a1..e4f1b56b3 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -37,7 +37,7 @@
<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.js"></script>
+ <script src="/static/js/perfect-scrollbar-0.6.5.jquery.min.js"></script>
<script src="/static/js/jquery-dragster/jquery.dragster.js"></script>
<style id="antiClickjack">body{display:none !important;}</style>