Update to 1.1.0

Josh Callender · Josh Callender · commit 5ee8b4a1c980 · 2015-06-11T17:15:44.000-07:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,8 @@
+# 1.1.0
+## 2015-06-11
+* update to backbone 1.2.1 and all it's goodness, older versions of lodash *will break* with this change set. lodash.mixin should allow for a fix
+* add x-http-method-override to allow for the 'emulateHTTP' property in backbone.
+
 # 1.0.5
 ## 2015-05-15
 * bug fix for require js race condition when rendering views
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rendr",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Render your Backbone.js apps on the client and the server.",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rendr",`
`3`		`- "version": "1.0.5",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"description": "Render your Backbone.js apps on the client and the server.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`