Files
bundesmessenger-ios/Riot.xcodeproj
manuroe 8a9df3d849 Merge remote-tracking branch 'origin/pr/1458' into callkit
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/AppDelegate.m
#	Riot/ViewController/SettingsViewController.m
2017-09-04 15:57:37 +02:00
..