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.xcodeproj
ryanzhao f603b422b0 Merge branch 'dev' into message-detail-screen
# Conflicts:
#	Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift
1 year ago
..
project.xcworkspace
xcshareddata Merge branch 'feature/updated-user-config-handling' of https://github.com/mpretty-cyro/session-ios into message-detail-screen 2 years ago
project.pbxproj Merge branch 'dev' into message-detail-screen 1 year ago