Commit graph

4 commits

Author SHA1 Message Date
Matthew Chen 00feb14b10 Respond to CR.
// FREEBIE
2017-11-15 13:15:48 -05:00
Matthew Chen 64a99c63b3 [SSK] Migrating changes from obsolete SSK repo.
// FREEBIE
2017-07-21 15:08:37 -04:00
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