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
Morgan Pretty 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	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/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift
3 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 3 years ago
Calls Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Closed Groups Fixed search performance, started styling in-conversaiton settings 3 years ago
Conversations Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
DMs Updated the conversation creation screens 3 years ago
Dependencies Remove SwiftCSV 4 years ago
Emoji update emoji names for searching 3 years ago
Home Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Meta Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Notifications Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Onboarding Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Open Groups Updated the conversation creation screens 3 years ago
Path Updated the conversation creation screens 3 years ago
Settings Fixed a couple of bugs and did some more theming 3 years ago
Shared Did some more styling and fixed a few UI bugs 3 years ago
Sheets & Modals Did some more styling and fixed a few UI bugs 3 years ago
Utilities Fixed search performance, started styling in-conversaiton settings 3 years ago
.swiftlint.yml Fix target naming 5 years ago