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 fa39b5f61c Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/CallVC.swift
#	Session/Conversations/Message Cells/Content Views/DocumentView.swift
#	Session/Conversations/Settings/OWSMessageTimerView.m
#	SessionMessagingKit/File Server/FileServerAPI.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/Networking/HTTP.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift
3 years ago
..
.tx
bin
de.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
en.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
es.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
fa.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
fi.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
fr.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
hi.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
hr.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
id-ID.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
it.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
ja.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
nl.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
pl.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
pt_BR.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
ru.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
si.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
sk.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
sv.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
th.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
vi-VN.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
zh-Hant.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
zh_CN.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
TRANSLATIONS.md
remove_unused_strings.swift Remove unused strings 5 years ago