Merge pull request #3427 from CocoaPods/kylef/mergeit

Merge stable-0.36 into master

CHANGELOG.md

@@ -37,6 +37,16 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 * Fixes an issue showing the URL to remote resources in `pod repo list`.  
   [Kyle Fuller](https://github.com/kylef)
 
+* Fixes a problem with code signing when integrating CocoaPods
+  into a Today Widget extension.  
+  [Christian Sampaio](https://github.com/chrisfsampaio)
+  [#3390](https://github.com/CocoaPods/CocoaPods/pull/3390)
+
+
+## 0.36.4
+
+##### Bug Fixes
+
 * Fixes various problems with Pods that use xcasset bundles. Pods that
   use xcassets can now be used with the `pod :path` option.  
   [Kyle Fuller](https://github.com/kylef)
@@ -44,11 +54,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [#3384](https://github.com/CocoaPods/CocoaPods/pull/3383)
   [#3358](https://github.com/CocoaPods/CocoaPods/pull/3358)
 
-* Fixes a problem with code signing when integrating CocoaPods
-  into a Today Widget extension.  
-  [Christian Sampaio](https://github.com/chrisfsampaio)
-  [#3390](https://github.com/CocoaPods/CocoaPods/pull/3390)
-
 
 ## 0.36.3
 

Gemfile.lock

@@ -7,10 +7,10 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 971a8c4aa452726bec255c784714a7a7ebaa55fc
+  revision: fe511bfaa565e88e899611ce544a42227a922b29
   branch: master
   specs:
-    cocoapods-core (0.36.3)
+    cocoapods-core (0.36.4)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       nap (~> 0.8.0)
@@ -24,7 +24,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: c42f8f2db7475210f4c4e28e6d2bb92859bb6766
+  revision: cf1e67a3b6f5f24c1084bc25ecf47cc16bb87dd4
   branch: master
   specs:
     xcodeproj (0.23.1)
@@ -57,7 +57,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-try.git
-  revision: 30b22d977b440ff4ef2c467b90f4191d321dda4b
+  revision: ed85f7469905f6d3dca3c134fd103b3a0918af15
   branch: master
   specs:
     cocoapods-try (0.4.3)
@@ -65,10 +65,10 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods (0.36.3)
+    cocoapods (0.36.4)
       activesupport (>= 3.2.15)
       claide (~> 0.8.1)
-      cocoapods-core (= 0.36.3)
+      cocoapods-core (= 0.36.4)
       cocoapods-downloader (~> 0.9.0)
       cocoapods-plugins (~> 0.4.2)
       cocoapods-trunk (~> 0.6.0)
@@ -116,7 +116,7 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.5.1)
+    minitest (5.6.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)

lib/cocoapods/gem_version.rb

 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.36.3' unless defined? Pod::VERSION
+  VERSION = '0.36.4' unless defined? Pod::VERSION
 end