1. 25 May, 2018 3 commits
  2. 23 May, 2018 5 commits
  3. 22 May, 2018 2 commits
  4. 21 May, 2018 2 commits
  5. 18 May, 2018 3 commits
  6. 17 May, 2018 6 commits
  7. 16 May, 2018 3 commits
  8. 10 May, 2018 6 commits
  9. 09 May, 2018 4 commits
  10. 07 May, 2018 6 commits
    • Samuel Giddins's avatar
      Merge tag '1.5.1' · 7352385b
      Samuel Giddins authored
      Release 1.5.1
      
      # gpg: Signature made Sun May  6 22:18:59 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:
      #	Gemfile.lock
      #	lib/cocoapods/gem_version.rb
      #	lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
      #	lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
      #	lib/cocoapods/installer/xcode/pods_project_generator.rb
      #	spec/cocoapods-integration-specs
      #	spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
      #	spec/unit/installer/xcode/pods_project_generator/pod_target_integrator_spec.rb
      #	spec/unit/installer/xcode/pods_project_generator_spec.rb
      #	spec/unit/target/pod_target_spec.rb
      7352385b
    • Samuel Giddins's avatar
      [CHANGELOG] Add empty Master section · a4f4accb
      Samuel Giddins authored
      a4f4accb
    • Samuel Giddins's avatar
      Release 1.5.1 · ddb59c7f
      Samuel Giddins authored
      ddb59c7f
    • Samuel Giddins's avatar
      Prepare to release 1.5.1 · 8ca1982f
      Samuel Giddins authored
      8ca1982f
    • Dimitris Koutsogiorgas's avatar
      Merge pull request #7688 from dnkoutso/fix_resource_framework_paths · b224cfec
      Dimitris Koutsogiorgas authored
      Do not include test dependencies input and output paths
      
      (cherry picked from commit 781d5047)
      
      # Conflicts:
      #	spec/unit/installer/xcode/pods_project_generator/pod_target_integrator_spec.rb
      b224cfec
    • Dimitris Koutsogiorgas's avatar
      Merge pull request #7659 from MaximeLM/asset_catalog_plist · 3acc7034
      Dimitris Koutsogiorgas authored
      Change generated asset catalog plist name
      
      (cherry picked from commit c109b144)
      
      # Conflicts:
      #	spec/cocoapods-integration-specs
      3acc7034