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/Meta
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
1 year ago
..
AudioFiles add silence audio file 2 years ago
Certificates Debug 3 years ago
Countries Improve onion request path loading efficiency 3 years ago
Fonts Fix missing font 3 years ago
Images.xcassets Added the version footer back to the settings screen 2 years ago
Mnemonic Debug 4 years ago
Settings.bundle Organize files 4 years ago
Translations Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities 1 year ago
TurnServers add session turn server info 2 years ago
AppDelegate.swift Merge branch 'dev' into ipad-landscape-support 2 years ago
AppEnvironment.swift Fixed the broken unit tests 2 years ago
Launch Screen.storyboard Updated the app settings screens 2 years ago
MainAppContext.h Re-organize files 4 years ago
MainAppContext.m Finished removing usages to non-theme colour variables 2 years ago
Session-Info.plist fix home screen conversation cell UI 2 years ago
Session-Prefix.pch Finished of the Conversation screen and JobQueue concurrency 2 years ago
SessionApp.swift Fixed most of the styling issues raised during QA 2 years ago
Signal-Bridging-Header.h Made a few last minute tweaks and fixes 2 years ago
Signal.entitlements Organize files 4 years ago
SignalTSan.supp Organize files 4 years ago
SignalUBSan.supp Organize files 4 years ago