SBiOSoftWhare 74351d2eee Merge branch 'develop' into riot_2918 ...

# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift

2020-03-30 09:55:40 +02:00

..

Images.swift

Add camera button assets.

2020-03-13 18:41:10 +01:00

RiotDefaults.swift

VoIP: Fallback to matrix.org STUN server with a confirmation dialog

2019-08-28 18:57:56 +02:00

Storyboards.swift

Create self verification start screen.

2020-03-27 15:39:23 +01:00

Strings.swift

Merge branch 'develop' into riot_2918

2020-03-30 09:55:40 +02:00