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 e4d6400375 Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities
# Conflicts:
#	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
2 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 3 years ago
Calls Fixed a few more bugs 2 years ago
Closed Groups Added the updated delivery status UI 2 years ago
Conversations Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 2 years ago
Dependencies Remove SwiftCSV 4 years ago
Emoji update emoji names for searching 3 years ago
Home Merge pull request #713 from RyanRory/accessibility-ids-2 2 years ago
Media Viewing & Editing Cleaned up some logic around sync messages 2 years ago
Meta Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 2 years ago
Notifications Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 2 years ago
Onboarding fix a crash happening when long mnemonic is used to recover an account 2 years ago
Open Groups Merge branch 'dev' into ipad-landscape-support 3 years ago
Path Fixed a couple of reachability oddities and bugs 2 years ago
Settings Started caching pending ReadReceipt messages to resolve an edge-case 2 years ago
Shared Added the updated delivery status UI 2 years ago
Utilities Theming tweaks and bug fixes 3 years ago
.swiftlint.yml Fix target naming 5 years ago