Skip to content

Commit

Permalink
Added changelog entry for CocoaPods#102
Browse files Browse the repository at this point in the history
  • Loading branch information
neonichu committed Apr 7, 2014
1 parent 49afa34 commit b85ecd3
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

##### Enhancements

* Accept new sources for Pods when they are just redirects of the old one.
[Boris Bügling](https://github.com/neonichu)
[#101](https://github.com/CocoaPods/Core/issues/101)
[#102](https://github.com/CocoaPods/Core/pull/102)

* Show informative error message when a merge conflict is detected in a YAML file.
[Luis de la Rosa](https://github.com/luisdelarosa)
[#69](https://github.com/CocoaPods/Core/issues/69)
Expand Down

0 comments on commit b85ecd3

Please sign in to comment.