Skip to content

Commit 689df1b

Browse files
committed
Handle key change in group send
// FREEBIE
1 parent 0e345db commit 689df1b

Some content is hidden

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

42 files changed

+5
-6
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'
77
#pod 'SignalServiceKit', path: '../SignalServiceKit'
88
pod 'OpenSSL'
99
pod 'PastelogKit', '~> 1.3'

Podfile.lock

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,19 @@ 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`)
126126
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
127127
- ZXingObjC
128128

129129
EXTERNAL SOURCES:
130130
SignalServiceKit:
131-
:branch: mkirk/outgoing-media-status#1231
132131
:git: https://github.com/WhisperSystems/SignalServiceKit.git
133132
SocketRocket:
134133
:git: https://github.com/facebook/SocketRocket.git
135134

136135
CHECKOUT OPTIONS:
137136
SignalServiceKit:
138-
:commit: 4ba1e86ec12c4e28de264fea59bd57af0aa3edea
137+
:commit: 31bd1d07a39a4fa0260620884e3aa9a0a59e5fde
139138
:git: https://github.com/WhisperSystems/SignalServiceKit.git
140139
SocketRocket:
141140
:commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -167,6 +166,6 @@ SPEC CHECKSUMS:
167166
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
168167
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
169168

170-
PODFILE CHECKSUM: 7dfde19734213e4ff876efa2ea10d536da2e0b47
169+
PODFILE CHECKSUM: 93ccdbbb243044904d772ee53e00154890a9f82f
171170

172171
COCOAPODS: 1.0.1

Signal/Signal-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</dict>
3939
</array>
4040
<key>CFBundleVersion</key>
41-
<string>2.6.3.5</string>
41+
<string>2.6.3.6</string>
4242
<key>ITSAppUsesNonExemptEncryption</key>
4343
<false/>
4444
<key>LOGS_EMAIL</key>
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)