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 5ca227434b Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Database/Storage+OpenGroups.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionMessagingKit/Storage.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/General/Atomic.swift
3 years ago
..
Backups Fix copyright notice 4 years ago
Closed Groups Started adding logic for the outbox endpoint 3 years ago
Conversations Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
DMs Fixed a couple of crashes 3 years ago
Dependencies Remove SwiftCSV 4 years ago
Home Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
Media Viewing & Editing Merge pull request #538 from RyanRory/video-progress-bar 3 years ago
Meta Merge branch 'dev' into feature/session-id-blinding-part-2 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 More unit tests, fixed a few issues uncovered by testing 3 years ago
Path move path button into setttings 3 years ago
Settings Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
Shared Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
Sheets & Modals Built out the Message Request functionality 3 years ago
Utilities Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
.swiftlint.yml Fix target naming 4 years ago