Commit Graph

2 Commits (d4fa7e5e68d2f06bf3ddab2be6e7a78ee42f15af)

Author SHA1 Message Date
Michael Kirk 52bd682565 fix some recently broken tests
// FREEBIE
9 years ago
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
9 years ago