Files
bundesmessenger-ios/Riot.xcodeproj
Giom Foret d26e358ee0 Merge branch 'master' into callkit
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/AppDelegate.m
#	Riot/ViewController/SettingsViewController.m
2017-10-04 13:04:21 +02:00
..