• Fabio Pelosin's avatar
    Merge branch 'master' into dedicated-targets · d7f9903d
    Fabio Pelosin authored
    * master:
      [Spec] Rebuild integration test fixtures.
      Use a different resources-to-copy.txt file for each target
      Grammar fix in CONTRIBUTING file
      Made SO link to our search query
      [CONTRIBUTING] Add back links to ML and SO. Thanks @secboffin.
      [CONTRIBUTING] Make it even clearer/simpler. Thanks to @Manfred.
      [CONTRIBUTING] Try to be as clear as possible about do's and don'ts.
    
    Conflicts:
    	spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_add_pod/after/execution_output.txt
    	spec/integration/install_custom_workspace/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_custom_workspace/after/execution_output.txt
    	spec/integration/install_external_source/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
    	spec/integration/install_external_source/after/execution_output.txt
    	spec/integration/install_local_source/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml
    	spec/integration/install_multiple_targets/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
    	spec/integration/install_multiple_targets/after/execution_output.txt
    	spec/integration/install_new/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_new/after/execution_output.txt
    	spec/integration/install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_podfile_callbacks/after/execution_output.txt
    	spec/integration/install_podspec/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_podspec/after/execution_output.txt
    	spec/integration/install_remove_pod/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_spec_callbacks/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_spec_callbacks/after/execution_output.txt
    	spec/integration/install_subspecs/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml
    	spec/integration/install_subspecs/after/execution_output.txt
    	spec/integration/update/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/update/after/execution_output.txt
    d7f9903d
SampleApp.xcodeproj.yaml 7.42 KB