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 9216506847 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session/Calls/Views & Modals/CallVideoView.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hr.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/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Utilities/BackgroundPoller.swift
#	SessionSnodeKit/OnionRequestAPI.swift
#	SessionSnodeKit/SnodeAPI.swift
2 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2 years ago
Calls fix an issue where current call implementation won't compile for simulators 2 years ago
Closed Groups Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Conversations Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
DMs fix session id label width 2 years ago
Dependencies Remove SwiftCSV 4 years ago
Home Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2 years ago
Media Viewing & Editing Merge branch 'bug-fixes-1.11.25' into voice-calls-2 2 years ago
Meta Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Notifications try to fix a call issue when iOS is on lock screen 2 years ago
Onboarding Merge branch 'dev' into ipad-support-1 2 years ago
Open Groups Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2 years ago
Path fix session id label width 2 years ago
Settings Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2 years ago
Shared Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Sheets & Modals slim the button width again 2 years ago
Utilities Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
.swiftlint.yml