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 7165b9e4f6 Merge branch 'dev' into feature/remove-OWSBlockingManager
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
3 years ago
..
Backups Cleaned up some config sync logic and allowed migrations to trigger them 3 years ago
Closed Groups Cleaned up some config sync logic and allowed migrations to trigger them 3 years ago
Conversations Merge branch 'dev' into feature/remove-OWSBlockingManager 3 years ago
DMs Fixed a couple of crashes 3 years ago
Dependencies Remove SwiftCSV 4 years ago
Home Merge branch 'dev' into feature/remove-OWSBlockingManager 3 years ago
Media Viewing & Editing Merge pull request #538 from RyanRory/video-progress-bar 3 years ago
Meta Merge branch 'dev' into feature/remove-OWSBlockingManager 3 years ago
Notifications Merge pull request #579 from mpretty-cyro/fix/message-request-crash 3 years ago
Onboarding mark current user as approved in message request migration 3 years ago
Open Groups Cleaned up some config sync logic and allowed migrations to trigger them 3 years ago
Path move path button into setttings 3 years ago
Settings Merge branch 'dev' into feature/remove-OWSBlockingManager 3 years ago
Shared Removed the OWSBlockingManager replacing it with the config sync 3 years ago
Sheets & Modals Built out the Message Request functionality 3 years ago
Utilities Merge branch 'dev' into preformance-improvement 3 years ago
.swiftlint.yml Fix target naming 5 years ago