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/Conversations
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
..
Context Menu Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 2 years ago
Emoji Picker Finished removing usages to non-theme colour variables 3 years ago
Input View Fixed a couple of reachability oddities and bugs 2 years ago
Message Cells Cleaned up some logic around sync messages 2 years ago
Settings Fixed a few build errors and cases where the offset wasn't taken into account 2 years ago
Views & Modals clean 2 years ago
ConversationSearch.swift Fixed most of the styling issues raised during QA 3 years ago
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 2 years ago
ConversationVC.swift Fixed an odd UI glitch which could occur when message cells updated 2 years ago
ConversationViewModel.swift Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 2 years ago