Commit 2795f570 authored by Stephen Hayes's avatar Stephen Hayes

Merge conflicts on CHANGELOG.md

parent 7cbc243f
...@@ -24,9 +24,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -24,9 +24,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#5837](https://github.com/CocoaPods/CocoaPods/pull/5837) [#5837](https://github.com/CocoaPods/CocoaPods/pull/5837)
* Greenify pod install success message
[Stephen Hayes](https://github.com/schayes04)
[#5713](https://github.com/CocoaPods/CocoaPods/issues/5713)
* Remove uses of `cd` in generated scripts * Remove uses of `cd` in generated scripts
[Ben Asher](https://github.com/benasher44) [Ben Asher](https://github.com/benasher44)
[#5959](https://github.com/CocoaPods/CocoaPods/pull/5959) [#5959](https://github.com/CocoaPods/CocoaPods/pull/5959)
...@@ -43,6 +40,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -43,6 +40,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Danielle Tomlinson](https://github.com/dantoml) [Danielle Tomlinson](https://github.com/dantoml)
[#5989](https://github.com/CocoaPods/CocoaPods/pull/5989) [#5989](https://github.com/CocoaPods/CocoaPods/pull/5989)
* Greenify pod install success message
[Stephen Hayes](https://github.com/schayes04)
[#5713](https://github.com/CocoaPods/CocoaPods/issues/5713)
##### Bug Fixes ##### Bug Fixes
* Remove special handling for messages apps * Remove special handling for messages apps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment