Merge branch 'master' into feature/autofocus

pebble · Jan 13, 2016 · 1f51521 · 1f51521
2 parents c0b8514 + b90346a
commit 1f51521
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cloudpebble/settings.py b/cloudpebble/settings.py
@@ -130,12 +130,12 @@
 
 BOWER_INSTALLED_APPS = (
     'https://github.com/krisk/Fuse.git#2c1560d763',
-    'jquery',
+    'jquery#~2.1.3',
     'underscore',
     'backbone',
     'text-encoding',
     'jshint/jshint',
-    'html.sortable',
+    'html.sortable#~0.3.1',
     'alexgorbatchev/jquery-textext',
     'codemirror#4.2.0',
     'kanaka/noVNC',