• 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
Name
Last commit
Last update
..
cocoapods-integration-specs @ d76d5718
fixtures Loading commit data...
functional Loading commit data...
integration Loading commit data...
spec_helper Loading commit data...
unit Loading commit data...
integration.rb Loading commit data...
spec_helper.rb Loading commit data...