Commit Graph

3 Commits (72e4de0950a6f5ae53f555ebeabb7557b97c2c42)

Author SHA1 Message Date
Matthew Chen 6a1bb3f04c Add web sockets protos to proto make file. 7 years ago
Michael Kirk 2975d4d5d2 Sync with android protos
// FREEBIE
7 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
8 years ago