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 1b0fda56ad Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.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/Notifications/SyncPushTokensJob.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ShareNavController.swift
1 year ago
..
bin Organize files 4 years ago
de.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
en.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
es.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
fa.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
fi.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
fr.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
hi.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
hr.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
id-ID.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
it.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
ja.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
nl.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
pl.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
pt_BR.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
ru.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
si.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
sk.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
sv.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
th.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
vi-VN.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
zh-Hant.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
zh_CN.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 1 year ago
TRANSLATIONS.md Organize files 4 years ago
remove_unused_strings.swift Remove unused strings 3 years ago