Commit c2bfbeb0 authored by Marius Rackwitz's avatar Marius Rackwitz

Merge tag '1.0.1'

Release 1.0.1

# gpg: Signature made Thu Jun  2 09:48:54 2016 CEST using RSA key ID 3DFEE92F
# gpg: Good signature from "Marius Rackwitz <kontakt@mariusrackwitz.de>" [unknown]
# gpg:                 aka "Marius Rackwitz <git@mariusrackwitz.de>" [unknown]
# 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: A17F 9CBC 413C 82A4 6079  0B66 0871 0E60 6F3D F673
#      Subkey fingerprint: 3770 0395 CD71 7665 8293  986E 5CCF E6D8 3DFE E92F

# Conflicts:
#	Gemfile
#	Gemfile.lock
parents 981a53c5 3832b472
......@@ -4,7 +4,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
To install release candidates run `[sudo] gem install cocoapods --pre`
## Master
## 1.0.1 (2016-06-02)
##### Enhancements
......
......@@ -7,10 +7,10 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: 37689bb1ae72df10882d38e9cf4f6d03cbb45ccd
revision: 628a2e908dff578db6e59b1ac6aec99b6f45cb95
branch: master
specs:
cocoapods-core (1.0.0)
cocoapods-core (1.0.1)
activesupport (>= 4.0.2)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
......@@ -94,10 +94,10 @@ GIT
PATH
remote: .
specs:
cocoapods (1.0.0)
cocoapods (1.0.1)
activesupport (>= 4.0.2)
claide (>= 1.0.0, < 2.0)
cocoapods-core (= 1.0.0)
cocoapods-core (= 1.0.1)
cocoapods-deintegrate (>= 1.0.0, < 2.0)
cocoapods-downloader (>= 1.0.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
......@@ -263,4 +263,4 @@ DEPENDENCIES
xcodeproj!
BUNDLED WITH
1.12.1
1.12.5
module Pod
# The version of the CocoaPods command line tool.
#
VERSION = '1.0.0'.freeze unless defined? Pod::VERSION
VERSION = '1.0.1'.freeze unless defined? Pod::VERSION
end
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