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 8109a326cf Merge remote-tracking branch 'upstream/dev' into feature/theming
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/CallMessageCell.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Home/NewConversationButtonSet.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/Open Groups/JoinOpenGroupVC.swift
#	Session/Open Groups/OpenGroupSuggestionGrid.swift
#	Session/Settings/SettingsVC.swift
#	Session/Shared/BaseVC.swift
#	Session/Shared/OWSQRCodeScanningViewController.m
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionShareExtension/SAEScreenLockViewController.swift
#	SessionUIKit/Style Guide/Gradients.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m
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 Merge remote-tracking branch 'upstream/dev' into feature/theming 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 Finished removing usages to non-theme colour variables 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 Finished removing usages to non-theme colour variables 3 years ago
Signal.entitlements Organize files 5 years ago
SignalTSan.supp Organize files 5 years ago
SignalUBSan.supp Organize files 5 years ago