move changelog to master and point specs to updated master

5c9ae664 · Konrad Feiler · 79de58e2 · 5c9ae664 · f7c00702
Commit 5c9ae664 authored Oct 22, 2016 by Konrad Feiler
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

CHANGELOG.md CHANGELOG.md +4 -4

cocoapods-integration-specs spec/cocoapods-integration-specs +1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

 ##### Bug Fixes

-* None.  
+* Add target-device tvOS in copy_resources generator.    
+[Konrad Feiler](https://github.com/Bersaelor)
+[#6052](https://github.com/CocoaPods/CocoaPods/issues/6052)


 ## 1.1.1 (2016-10-20)
@@ -50,9 +52,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

 ##### Bug Fixes

-* Add target-device tvOS in copy_resources generator.    
-[Konrad Feiler](https://github.com/Bersaelor)
-[#6052](https://github.com/CocoaPods/CocoaPods/issues/6052)
+* None.  

 ## 1.1.0.rc.3 (2016-10-11)


--- a/cocoapods-integration-specs @ f7c00702
+++ b/cocoapods-integration-specs @ f7c00702
-Subproject commit bd1a7c0f2a71b1168c4743c2d5f4b873a43becbb
+Subproject commit f7c00702a648e986ddb11658b374c36c136ca3a0