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 7d47a36f9f Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Shared/Views/SessionAvatarCell.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
3 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 4 years ago
Calls Updated to the latest version of libSession-util 3 years ago
Closed Groups Updated to the latest lib, started handling UserGroups 3 years ago
Conversations Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
Dependencies Remove SwiftCSV 5 years ago
Emoji Further config util logic 3 years ago
Home Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
Meta Cleaned up a bunch of code, added pinned and hidden handling 3 years ago
Notifications Cleaned up a bunch of code, added pinned and hidden handling 3 years ago
Onboarding Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
Open Groups Updated to the latest lib, started handling UserGroups 3 years ago
Path Fixed a couple of reachability oddities and bugs 3 years ago
Settings Fixed a number of bugs with the config handling 3 years ago
Shared Updated to the latest lib, started handling UserGroups 3 years ago
Utilities Fixed a number of bugs with the config handling 3 years ago
.swiftlint.yml Fix target naming 5 years ago