Unverified Commit d01fc4d5 authored by Samuel Giddins's avatar Samuel Giddins

Merge tag '1.5.2'

Release 1.5.2

# gpg: Signature made Wed May  9 08:05:28 2018 PDT
# gpg:                using RSA key 01195BB315DDA856
# gpg: Good signature from "Samuel Giddins <segiddins@segiddins.me>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7B19 37A9 CF66 AEF6 52C9  4090 0119 5BB3 15DD A856

# Conflicts:
#	spec/cocoapods-integration-specs
parents 7352385b 8617fe8f
......@@ -41,6 +41,17 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins)
## 1.5.2 (2018-05-09)
##### Enhancements
* None.
##### Bug Fixes
* None.
## 1.5.1 (2018-05-07)
##### Enhancements
......
......@@ -7,10 +7,10 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: 14db1616354add8708bd7a4b421ee7495ae38c7a
revision: 0840691058b9fe96f759dacc26642207beb050cd
branch: master
specs:
cocoapods-core (1.5.1)
cocoapods-core (1.5.2)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
......@@ -103,10 +103,10 @@ GIT
PATH
remote: .
specs:
cocoapods (1.5.1)
cocoapods (1.5.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.1)
cocoapods-core (= 1.5.2)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
......
module Pod
# The version of the CocoaPods command line tool.
#
VERSION = '1.5.1'.freeze unless defined? Pod::VERSION
VERSION = '1.5.2'.freeze unless defined? Pod::VERSION
end
Subproject commit d76d57181848aff661506ad5b6d6481fc79d86f8
Subproject commit c9eb7708b0c8d528ddbe030e93fc6ef80bab9691
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