Merge pull request #1690 from hypothesis/use-upstream-minified-jquery

Use jquery.min.js downloaded from jQuery.com

Merge pull request #1690 from hypothesis/use-upstream-minified-jquery
Use jquery.min.js downloaded from jQuery.com
65603e09 · Randall Leeds · a057fcc9 · 0feb77b2 · 65603e09 · 65603e09
Commit 65603e09 authored Nov 15, 2014 by Randall Leeds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

package.json h/browser/firefox/package.json +1 -1

.gitignore h/static/scripts/vendor/.gitignore +1 -0

jquery.min.js h/static/scripts/vendor/jquery.min.js +6 -0

No files found.
--- a/h/browser/firefox/package.json
+++ b/h/browser/firefox/package.json
@@ -5,5 +5,5 @@
  "description": "Annotate, highlight, and discuss anything on the Web.",
  "author": "hypothes.is",
  "license": "BSD",
-  "version": "0.2.1"
+  "version": "0.2.2"
 }
--- a/h/static/scripts/vendor/.gitignore
+++ b/h/static/scripts/vendor/.gitignore
 *.min.js
+!jquery.min.js
--- a/h/static/scripts/vendor/jquery.min.js
+++ b/h/static/scripts/vendor/jquery.min.js