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
Morgan Pretty 1b0fda56ad Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Notifications/SyncPushTokensJob.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ShareNavController.swift
2 years ago
..
Calls Fixed up the remaining reported internal testing issues 2 years ago
Common Networking Added in missing code changes unrelated to closed groups rebuild 2 years ago
Database Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years ago
File Server Fixed a number of issues found during internal testing 2 years ago
Jobs/Types Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years ago
Messages Cleaning up final things before release 2 years ago
Meta Theming tweaks and bug fixes 3 years ago
Open Groups Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years ago
Protos Updated to the latest version of libSession-util 2 years ago
Sending & Receiving Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years ago
SessionUtil Cleaning up final things before release 2 years ago
Shared Models Fixes for user config crashes 2 years ago
Utilities Cleaning up final things before release 2 years ago
Configuration.swift CI tweaks and incremented build number 2 years ago
SMKDependencies.swift Fixed up the remaining reported internal testing issues 2 years ago