Skip to content

Commit 94efbc8

Browse files
committed
Handle key change in group send
// FREEBIE
1 parent a19774f commit 94efbc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+5
-5
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
33

44
target 'Signal' do
55
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
6-
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/outgoing-media-status#1231'
6+
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/fix-group-send-keychange-error'
77
#pod 'SignalServiceKit', path: '../SignalServiceKit'
88
pod 'OpenSSL'
99
pod 'PastelogKit', '~> 1.3'

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,20 @@ DEPENDENCIES:
122122
- OpenSSL
123123
- PastelogKit (~> 1.3)
124124
- SCWaveformView (~> 1.0)
125-
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/outgoing-media-status#1231`)
125+
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/fix-group-send-keychange-error`)
126126
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
127127
- ZXingObjC
128128

129129
EXTERNAL SOURCES:
130130
SignalServiceKit:
131-
:branch: mkirk/outgoing-media-status#1231
131+
:branch: mkirk/fix-group-send-keychange-error
132132
:git: https://github.com/WhisperSystems/SignalServiceKit.git
133133
SocketRocket:
134134
:git: https://github.com/facebook/SocketRocket.git
135135

136136
CHECKOUT OPTIONS:
137137
SignalServiceKit:
138-
:commit: 4ba1e86ec12c4e28de264fea59bd57af0aa3edea
138+
:commit: dd5e7f99528c5db9145322243c7d7789ed986ba7
139139
:git: https://github.com/WhisperSystems/SignalServiceKit.git
140140
SocketRocket:
141141
:commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -167,6 +167,6 @@ SPEC CHECKSUMS:
167167
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
168168
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
169169

170-
PODFILE CHECKSUM: 7dfde19734213e4ff876efa2ea10d536da2e0b47
170+
PODFILE CHECKSUM: 00a353dbe3312f9b4d29e36ce07215e1e8f8328b
171171

172172
COCOAPODS: 1.0.1
452 Bytes
Binary file not shown.
452 Bytes
Binary file not shown.
452 Bytes
Binary file not shown.
452 Bytes
Binary file not shown.
452 Bytes
Binary file not shown.
452 Bytes
Binary file not shown.
452 Bytes
Binary file not shown.
452 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)