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/SessionUtilitiesKit
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
..
Crypto Got the '/inbox' APIs and encryption/decryption/validation working 3 years ago
Database Attempt to fix extensions 4 years ago
General Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
Media Added support for Microsoft Word, Excel & Powerpoint previews 3 years ago
Messaging Re-organize files 4 years ago
Meta Started work on updated SOGS support 3 years ago
Networking File upload working, further code cleanup 3 years ago
PromiseKit refactor on timer and polling threading 3 years ago
Configuration.swift Fix module linking issue 5 years ago