Morgan Pretty a6931bb922 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Shared/SessionTableViewController.swift # Session/Shared/SessionTableViewModel.swift # Session/Shared/Types/SessionTableSection.swift # SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift # SessionUIKit/Components/SessionButton.swift		2 years ago
..
Conversations/Settings	Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign	2 years ago
Database	Added unit tests to verify migrations between all versions work	2 years ago
Settings	Fixed the broken tests	2 years ago