oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,492 Commits 5 Branches 133 Tags 218 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Matthew Chen 4f5b2993b0 [SSK] Migrating changes from obsolete SSK repo. 
// FREEBIE
 2017-07-21 14:55:31 -04: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