Merge pull request #280 from jakerella/prep-for-v2.1.1

v2.1.1 Bug fix release
jakerella · Feb 7, 2016 · 8f9981d · 8f9981d
2 parents c1e8bee + 9a0fa14
commit 8f9981d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2016-02-07 v2.1.1
+	* Reorganize test cases into separate files for ease of maintenance and testing
+	* Fix #86: JSONP return data treated as JSON
+	* Added jQuery 1.12.0 to test quite
+	* Fix #105: Using XML files as proxies
+	* Fix #267: Handle undefined URL argument correctly
+	* Fix #123: Handle query string formatted data option
+
 ## 2016-01-23
     * Updated to version 2.1.0
     * Removed unused testswarm files

diff --git a/dist/jquery.mockjax.js b/dist/jquery.mockjax.js
@@ -1,7 +1,7 @@
 /*! jQuery Mockjax
  * A Plugin providing simple and flexible mocking of ajax requests and responses
  * 
- * Version: 2.1.0
+ * Version: 2.1.1
  * Home: https://github.com/jakerella/jquery-mockjax
  * Copyright (c) 2016 Jordan Kasper, formerly appendTo;
  * NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014

diff --git a/dist/jquery.mockjax.min.js b/dist/jquery.mockjax.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery-mockjax",
   "title": "jQuery Mockjax",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "./src/jquery.mockjax.js",
   "description": "The jQuery Mockjax Plugin provides a simple and extremely flexible interface for mocking or simulating ajax requests and responses.",
   "url": "https://github.com/jakerella/jquery-mockjax",