Merge pull request #92 from CocoaPods/merge12_into_master

Merge `1-2-stable` (1.2.2) into `master`
CocoaPods · Nov 14, 2019 · 3f4c35e · 3f4c35e
2 parents bea449f + eed6db7
commit 3f4c35e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
+dist: trusty
+
 os:
   - osx
 
@@ -24,6 +26,7 @@ before_install:
   - if [ "$TRAVIS_RUBY_VERSION" = "system" ]; then sudo gem install "bundler:~> 1.15.0"; else gem install "bundler:~> 1.15.0"; fi
 
 install:
+  - brew update
   - brew install bzr
   - bundle install
   - git config --global user.name  'CI'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@
 * Remove archives after an `HTTP` download.  
   [Samuel Giddins](https://github.com/segiddins)
 
+
 ## 1.2.0 (2018-04-04)
 
 ##### Enhancements