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/SessionMessagingKit/SessionUtil/Config Handling
Morgan Pretty 65057fba21 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserProfile.swift
#	SessionMessagingKit/SessionUtil/Database/QueryInterfaceRequest+Utilities.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/Utilities/Bencode.swift
#	SignalUtilitiesKit/Utilities/AppSetup.swift
2 years ago
..
SessionUtil+Contacts.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
SessionUtil+ConvoInfoVolatile.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
SessionUtil+GroupInfo.swift Reworked SnodeAPI auth and prepared requests 2 years ago
SessionUtil+GroupKeys.swift Reworked SnodeAPI auth and prepared requests 2 years ago
SessionUtil+GroupMembers.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
SessionUtil+Shared.swift Reworked SnodeAPI auth and prepared requests 2 years ago
SessionUtil+SharedGroup.swift Adding support for a few more properties group members 2 years ago
SessionUtil+UserGroups.swift Adding support for a few more properties group members 2 years ago
SessionUtil+UserProfile.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago