Merge branch 'master' of github.com:julianshapiro/velocity

# Conflicts: # velocity.min.js
julianshapiro · Dec 1, 2016 · 649a074 · 649a074
2 parents 6098604 + fbb5540
commit 649a074
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Velocity 1.3.1
+## Velocity 1.3.2
 
 **Docs**
 [http://VelocityJS.org](http://velocityjs.org)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "velocity-animate",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Accelerated JavaScript animation.",
   "keywords": [
     "velocity",

diff --git a/velocity.js b/velocity.js
@@ -1,4 +1,4 @@
-/*! VelocityJS.org (1.3.1). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */
+/*! VelocityJS.org (1.3.2). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */
 
 /*************************
  Velocity jQuery Shim
@@ -676,7 +676,7 @@
 			hook: null, /* Defined below. */
 			/* Velocity-wide animation time remapping for testing purposes. */
 			mock: false,
-			version: {major: 1, minor: 3, patch: 1},
+			version: {major: 1, minor: 3, patch: 2},
 			/* Set to 1 or 2 (most verbose) to output debug info to console. */
 			debug: false,
 			/* Use rAF high resolution timestamp when available */

diff --git a/velocity.min.js b/velocity.min.js
diff --git a/velocity.ui.js b/velocity.ui.js
@@ -2,7 +2,7 @@
  Velocity UI Pack
  **********************/
 
-/* VelocityJS.org UI Pack (5.1.1). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License. Portions copyright Daniel Eden, Christian Pucci. */
+/* VelocityJS.org UI Pack (5.1.2). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License. Portions copyright Daniel Eden, Christian Pucci. */
 
 (function(factory) {
 	"use strict";