merged

bitdeli · Nov 25, 2013 · 4f69acd · 4f69acd
2 parents 2e61c72 + 8969b40
commit 4f69acd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/History.md b/History.md
@@ -1,7 +1,11 @@
-1.1.3 - November 25, 2013
+1.1.4 - November 25, 2013
 -------------------------
 * fix `page` method properties overload
 
+1.1.3 - November 21, 2013
+-------------------------
+* update `analytics.js-integrations` to `0.2.10`
+
 1.1.2 - November 21, 2013
 -------------------------
 * update `analytics.js-integrations` to `0.2.9`

diff --git a/analytics.js b/analytics.js
@@ -9533,7 +9533,7 @@ var analytics = module.exports = exports = new Analytics();
  * Expose `VERSION`.
  */
 
-exports.VERSION = '1.1.3';
+exports.VERSION = '1.1.4';
 
 
 /**

diff --git a/analytics.min.js b/analytics.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "analytics",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "main": "analytics.js",
   "dependencies": {},
   "devDependencies": {}

diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
   "name": "analytics",
   "repo": "segmentio/analytics.js",
   "description": "The hassle-free way to integrate analytics into any web application.",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "keywords": [
     "analytics",
     "analytics.js",
@@ -24,7 +24,7 @@
     "ianstormtaylor/is": "0.1.0",
     "segmentio/after": "0.0.1",
     "segmentio/analytics.js-integration": "0.1.4",
-    "segmentio/analytics.js-integrations": "0.2.9",
+    "segmentio/analytics.js-integrations": "0.2.10",
     "segmentio/canonical": "0.0.1",
     "segmentio/extend": "0.0.1",
     "segmentio/is-email": "0.1.1",

diff --git a/lib/index.js b/lib/index.js
@@ -21,7 +21,7 @@ var analytics = module.exports = exports = new Analytics();
  * Expose `VERSION`.
  */
 
-exports.VERSION = '1.1.3';
+exports.VERSION = '1.1.4';
 
 
 /**

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "analytics.js",
   "author": "Segment.io <[email protected]>",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "license": "MIT",
   "description": "The hassle-free way to integrate analytics into any web application.",
   "keywords": ["analytics", "analytics.js", "segment", "segment.io"],
-Original file line number
+Diff line change
@@ Expand Up @@
      * Expose `VERSION`.
      */
-    exports.VERSION = '1.1.3';
+    exports.VERSION = '1.1.4';
     /**
@@ Expand Down @@