Morgan Pretty 21924ee81a Merge branch 'dev' into feature/remove-OWSBlockingManager ... # Conflicts: # Session.xcodeproj/project.pbxproj		2022-03-29 08:45:48 +11:00
..
Migrations	Merge branch 'dev' into feature/remove-OWSBlockingManager	2022-03-29 08:45:48 +11:00
AppPreferences.swift	Re-organize files	2021-01-12 11:25:31 +11:00
OWSPrimaryStorage+keyFromIntLong.h	Restructure	2020-11-25 16:15:16 +11:00
OWSPrimaryStorage+keyFromIntLong.m	Restructure	2020-11-25 16:15:16 +11:00
Storage+Conformances.swift	Fully switch to the new contact API	2021-07-22 14:41:27 +10:00
TSStorageHeaders.h	Remove the Signal protocol	2021-01-04 13:59:21 +11:00
TSStorageKeys.h	Restructure	2020-11-25 16:15:16 +11:00
ThreadViewHelper.h	Restructure	2020-11-25 16:15:16 +11:00
ThreadViewHelper.m	Rename contactIdentifier → contactSessionID	2021-05-05 10:00:39 +10:00
YapDatabase+Promise.swift	Restructure	2020-11-25 16:15:16 +11:00