Released v1.1.2

lukemelia · lukemelia · commit 005a60ecd779 · 2017-06-30T20:26:44.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [v1.1.2](https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack/tree/v1.1.2) (2017-06-30)
+[Full Changelog](https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack/compare/v1.1.1...v1.1.2)
+
+**Merged pull requests:**
+
+- Update s3 plugin to 1.1.0 [\#40](https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack/pull/40) ([jrowlingson](https://github.com/jrowlingson))
+
 ## [v1.1.1](https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack/tree/v1.1.1) (2017-05-04)
 [Full Changelog](https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack/compare/v1.1.0...v1.1.1)
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-deploy-lightning-pack",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A pack of ember-cli-deploy plugins for implementing the 'lightning' deploys approach.",
   "scripts": {},
   "repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ember-cli-deploy-lightning-pack",`
`3`		`- "version": "1.1.1",`
	`3`	`+ "version": "1.1.2",`
`4`	`4`	`"description": "A pack of ember-cli-deploy plugins for implementing the 'lightning' deploys approach.",`
`5`	`5`	`"scripts": {},`
`6`	`6`	`"repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack",`