diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-08-03 15:47:12 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-08-03 15:47:12 -0400 |
| commit | bf1e00b3380b90aba4944fa2738f930516ad8b01 (patch) | |
| tree | 47b480d87d480748c6de455dfdb3dce997b3cc65 /SmartDeviceLink.podspec | |
| parent | 654f2e9066e513a2396e8a11638481a43d345895 (diff) | |
| parent | b0744242a4d9ff1344a6a1dd04ce0c451be8da38 (diff) | |
| download | sdl_ios-bf1e00b3380b90aba4944fa2738f930516ad8b01.tar.gz | |
Merge branch 'release/5.0.0' into feature/streaming_media_manager
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
Diffstat (limited to 'SmartDeviceLink.podspec')
0 files changed, 0 insertions, 0 deletions
