Merge branch 'master' of github.com:HubSpot/tether

zackbloom · zackbloom · commit e189e63c32e9 · 2013-12-17T22:08:37.000-05:00
Conflicts:
	tether.min.js
diff --git a/bower.json b/bower.json
@@ -10,7 +10,7 @@
     "shift.js",
     "shift.min.js"
   ],
-  "version": "0.1.2",
+  "version": "0.1.3",
   "homepage": "https://github.hubspot.com/tether",
   "authors": [
     "Zack Bloom <zbloom@hubspot.com>",
diff --git a/examples/tooltip/index.html b/examples/tooltip/index.html
@@ -70,7 +70,7 @@
         <script src="../resources/js/log.js"></script>
         <script src="../resources/js/jquery.js"></script>
         <script src="../../tether.js"></script>
-        <script src="../../drop.js"></script>
+        <script src="/drop/drop.min.js"></script>
         <script src="../../tooltip.js"></script>
         <script src="../../constraint.js"></script>
         <script>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tether",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "authors": [
     "Zack Bloom <zbloom@hubspot.com>",
diff --git a/shift.coffee b/shift.coffee
@@ -20,7 +20,7 @@ Tether.modules.push
       shiftLeft = parseFloat shiftLeft, 10
     else
       [shiftTop, shiftLeft] = [shift.top, shift.left]
-    
+
     top += shiftTop
     left += shiftLeft
 
diff --git a/tether.min.js b/tether.min.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tether",`
`3`		`- "version": "0.1.2",`
	`3`	`+ "version": "0.1.3",`
`4`	`4`	`"description": "",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Zack Bloom <zbloom@hubspot.com>",`