oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
11871 commits 5 branches 133 tags 218 MiB
Commit graph

5 commits

Author SHA1 Message Date
Matthew Chen
122ef91e57 Add protocol context to protocol kit. 2018-02-09 10:31:29 -05:00
Matthew Chen
9ac2383a2c Retain changes from session database branch. 2018-01-10 12:18:29 -05:00
Matthew Chen
9a990b58e8 Respond to CR. 2017-12-19 11:38:25 -05:00
Michael Kirk
5e7ca89930 Proper function prototypes 
// FREEBIE
 2017-12-04 12:50:28 -05:00
Michael Kirk
ccb4a88742 Import SSK (and history) into Signal-iOS 
git remote add ssk ../SignalServiceKit
git remote update
git merge -s ours --allow-unrelated-histories --no-commit ssk/master
git read-tree --prefix=SignalServiceKit -u ssk/master
git commit
 2017-07-21 13:55:01 -04:00