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 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	Session/Meta/AppDelegate.swift
#	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
#	Session/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift
3 years ago
..
AudioFiles add silence audio file 3 years ago
Certificates Debug 4 years ago
Countries Improve onion request path loading efficiency 4 years ago
Fonts Fix missing font 4 years ago
Images.xcassets Applied theming to a number of screens, some minor cleanup and bug fixes 3 years ago
Mnemonic Debug 5 years ago
Settings.bundle Organize files 5 years ago
Translations Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
TurnServers add session turn server info 3 years ago
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
AppEnvironment.swift Fixed the broken unit tests 3 years ago
Launch Screen.storyboard Updated the app settings screens 3 years ago
MainAppContext.h Re-organize files 4 years ago
MainAppContext.m Fixed the broken unit tests 3 years ago
Session-Info.plist bump up version & build number 3 years ago
Session-Prefix.pch Finished of the Conversation screen and JobQueue concurrency 3 years ago
SessionApp.swift Fixed a number of reported bugs, some cleanup, added animated profile support 3 years ago
Signal-Bridging-Header.h Fixed search performance, started styling in-conversaiton settings 3 years ago
Signal.entitlements Organize files 5 years ago
SignalTSan.supp Organize files 5 years ago
SignalUBSan.supp Organize files 5 years ago