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 18b296bcd8 Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.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/sk.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift
#	SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift
#	SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift
#	SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
2 years ago
..
AudioFiles add silence audio file 3 years ago
Certificates Updated the certificate for seed3 2 years ago
Countries Improve onion request path loading efficiency 4 years ago
Fonts Fix missing font 4 years ago
Images.xcassets Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 2 years ago
Mnemonic Debug 5 years ago
Settings.bundle Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support 2 years ago
Translations Refactored the LintLocalizableStrings 2 years ago
TurnServers add session turn server info 3 years ago
AppDelegate.swift Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support 2 years ago
AppEnvironment.swift Fixed a few more PN logic issues 2 years ago
Launch Screen.storyboard Updated the app settings screens 3 years ago
MainAppContext.swift Fixed a number of issues with the Notification Service Extension 2 years ago
Session-Info.plist clean 2 years ago
SessionApp.swift Fixed a couple more issues 2 years ago
Signal-Bridging-Header.h Merge branch 'dev' into disappearing-message-redesign 2 years ago
Signal.entitlements Removed the iCloud entitlements 2 years ago
SignalTSan.supp Organize files 5 years ago
SignalUBSan.supp Organize files 5 years ago