You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/Session
Morgan Pretty c25f378c54 Merge branch 'feature/database-refactor' into emoji-reacts
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Context Menu/ContextMenuVC+Action.swift
#	Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
#	Session/Conversations/Context Menu/ContextMenuVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewItem.h
#	Session/Conversations/ConversationViewItem.m
#	Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
#	Session/Conversations/Message Cells/MessageCell.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Conversations/Views & Modals/BodyTextView.swift
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Jobs/MessageSendJob.swift
#	SessionMessagingKit/Messages/Signal/TSMessage.h
#	SessionMessagingKit/Messages/Signal/TSMessage.m
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionNotificationServiceExtension/NSENotificationPresenter.swift
#	SignalUtilitiesKit/Utilities/DisplayableText.swift
#	SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
#	SignalUtilitiesKit/Utilities/Notification+Loki.swift
3 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 4 years ago
Calls Added linting for the localized strings, updated the quote & mention behaviour for the current user 3 years ago
Closed Groups Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 3 years ago
Conversations Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
DMs Applied the "increase min version to iOS 13" changes 3 years ago
Dependencies Remove SwiftCSV 5 years ago
Emoji Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
Home Updated the message request approval process to run asynchronously 3 years ago
Media Viewing & Editing Added defensive coding to prevent some crashes 3 years ago
Meta Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
Notifications Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
Onboarding Added linting for the localized strings, updated the quote & mention behaviour for the current user 3 years ago
Open Groups Fixed an edge-case crash, a couple of minor bugs and made future-proofing tweaks 3 years ago
Path Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 3 years ago
Settings Added linting for the localized strings, updated the quote & mention behaviour for the current user 3 years ago
Shared Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
Sheets & Modals Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 3 years ago
Utilities Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
.swiftlint.yml