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/Translations
Morgan Pretty be7881ad2e Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Views/SessionCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Contact.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Protos/Generated/SNProto.swift
#	SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
#	SessionMessagingKit/Protos/SessionProtos.proto
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionSnodeKit/Models/SnodeAPIEndpoint.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Features.swift
1 year ago
..
.tx Organize files 4 years ago
bin Organize files 4 years ago
de.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
en.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
es.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
fa.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
fi.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
fr.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
hi.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
hr.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
id-ID.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
it.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
ja.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
nl.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
pl.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
pt_BR.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
ru.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
si.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
sk.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
sv.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
th.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
vi-VN.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
zh-Hant.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
zh_CN.lproj Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
TRANSLATIONS.md Organize files 4 years ago
remove_unused_strings.swift Remove unused strings 3 years ago