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 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
3 years ago
..
Calls Fixed a few build errors and cases where the offset wasn't taken into account 3 years ago
Common Networking tweak: add update types of reaction to query parameter 3 years ago
Database Started caching pending ReadReceipt messages to resolve an edge-case 3 years ago
File Server Fixed an incorrect size in the FileServerAPI which could result in upload errors 3 years ago
Jobs/Types Started caching pending ReadReceipt messages to resolve an edge-case 3 years ago
Messages Started caching pending ReadReceipt messages to resolve an edge-case 3 years ago
Meta Theming tweaks and bug fixes 3 years ago
Open Groups Started caching pending ReadReceipt messages to resolve an edge-case 3 years ago
Protos Fixed a few more QA issues, added a minor feature 3 years ago
Sending & Receiving Started caching pending ReadReceipt messages to resolve an edge-case 3 years ago
Shared Models Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 3 years ago
Utilities Added a warning prompt the first time someone uses Giphy 3 years ago
Configuration.swift Started caching pending ReadReceipt messages to resolve an edge-case 3 years ago