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 1db80dfa13 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/CallVC.swift
#	Session/Calls/WebRTC/WebRTCSession+MessageHandling.swift
#	Session/Calls/WebRTC/WebRTCSession.swift
#	Session/Meta/AppDelegate.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Sending & Receiving/Errors/MessageReceiverError.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionUtilitiesKit/General/SNUserDefaults.swift
2 months ago
..
Calls Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 months ago
Closed Groups Fixed a number of QA issues and other bugs founds 2 months ago
Conversations Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 months ago
Database/Migrations Fixed a number of QA issues and other bugs founds 2 months ago
Emoji Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
Home Fixed a number of QA issues and other bugs founds 2 months ago
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
Meta Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 months ago
Notifications Fixed the build issues and broken unit tests 3 months ago
Onboarding Fixed a number of QA issues and other bugs founds 2 months ago
Open Groups Cleaned up some TODOs, QA fixes and refetch on admin promotion 3 months ago
Path Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 6 months ago
Settings Fixed a number of QA issues and other bugs founds 2 months ago
Shared Fixed a few more QA issues 2 months ago
Utilities Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 months ago
.swiftlint.yml