diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2016-05-19 11:37:15 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2016-05-19 11:37:15 -0400 |
| commit | 3a1b4d14f772b13069516e665695186981a6d1c3 (patch) | |
| tree | e528b44cbe0fd3422b186a33dcddef068792c0c9 | |
| parent | 453cd3c270e068cceb0e4c651359314fb050f434 (diff) | |
| parent | dc970adc435b06ac3d75244c4135d3e9434de216 (diff) | |
| download | sdl_ios-3a1b4d14f772b13069516e665695186981a6d1c3.tar.gz | |
Merge branch 'master' into hotfix/issue_395hotfix/issue_395
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 4 | ||||
| -rw-r--r-- | .gitignore | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2d634b386..2b3f22d93 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,7 @@ +[Things to note: Pull Requests **must** fix an issue. Discussion about the feature / bug takes place in the issue, discussion of the implementation takes place in the PR. Please also see the [Contributing Guide](https://github.com/smartdevicelink/sdl_ios/blob/master/.github/CONTRIBUTING.md) for information on branch naming and the CLA. + +Delete the above section when you've read it.] + Fixes #[issue number] This PR is **[ready / not ready]** for review. diff --git a/.gitignore b/.gitignore index 2297b4869..a997e37b8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,6 @@ Carthage.pkg SmartDeviceLink-iOS/Carthage/Build SmartDeviceLink-iOS/Carthage/Checkouts SmartDeviceLink-iOS/infer-out +# This ignore here is prevent projects fetching sdl_ios as a submodule using +# Carthage from resulting as `-dirty` in the `git status`. +Carthage/Build |