diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
| commit | f173793e51e726a887b84b4c37588e2e308191cc (patch) | |
| tree | 0c03feb8ebdb68a99c51d3f24c3aa39755f14793 /src/objective-c/examples/Sample/Pods/Target Support Files/Pods-SampleTests/Pods-SampleTests-acknowledgements.markdown | |
| parent | 882d7a7eec148046a90e1d111b93e353e3df0c31 (diff) | |
| parent | 1685d773ef81420bf747c6988a2ad9baefd126fa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into travis-speedup
Conflicts:
.travis.yml
Diffstat (limited to 'src/objective-c/examples/Sample/Pods/Target Support Files/Pods-SampleTests/Pods-SampleTests-acknowledgements.markdown')
| -rw-r--r-- | src/objective-c/examples/Sample/Pods/Target Support Files/Pods-SampleTests/Pods-SampleTests-acknowledgements.markdown | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/objective-c/examples/Sample/Pods/Target Support Files/Pods-SampleTests/Pods-SampleTests-acknowledgements.markdown b/src/objective-c/examples/Sample/Pods/Target Support Files/Pods-SampleTests/Pods-SampleTests-acknowledgements.markdown deleted file mode 100644 index 255149a828..0000000000 --- a/src/objective-c/examples/Sample/Pods/Target Support Files/Pods-SampleTests/Pods-SampleTests-acknowledgements.markdown +++ /dev/null @@ -1,3 +0,0 @@ -# Acknowledgements -This application makes use of the following third party libraries: -Generated by CocoaPods - http://cocoapods.org |