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 3e97782d18 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.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
4 years ago
..
Backups Fix copyright notice 4 years ago
Closed Groups Fixed a couple of crashes 4 years ago
Conversations Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
DMs Fixed a couple of crashes 4 years ago
Dependencies Remove SwiftCSV 5 years ago
Home Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
Media Viewing & Editing Merge pull request #538 from RyanRory/video-progress-bar 4 years ago
Meta Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
Notifications Fixed a few bugs uncovered by QA 4 years ago
Onboarding Fixed a couple of crashes 4 years ago
Open Groups Started resolving TODOs 4 years ago
Path move path button into setttings 4 years ago
Settings Merge branch 'dev' into feature/message-requests 4 years ago
Shared Merge branch 'dev' into feature/message-requests 4 years ago
Sheets & Modals Built out the Message Request functionality 4 years ago
Utilities Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
.swiftlint.yml