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 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
..
.tx Organize files 5 years ago
bin Organize files 5 years ago
de.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
en.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
es.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
fa.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
fi.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
fr.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
hi.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
hr.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
id-ID.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
it.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
ja.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
nl.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
pl.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
pt_BR.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
ru.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
si.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
sk.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
sv.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
th.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
vi-VN.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
zh-Hant.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
zh_CN.lproj Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
TRANSLATIONS.md Organize files 5 years ago
remove_unused_strings.swift Remove unused strings 4 years ago