element-ios/Riot.xcodeproj
ismailgulek 387cfb7787
Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
2020-07-01 09:59:29 +03:00
..
xcshareddata/xcschemes Update project recommended settings 2018-07-10 10:21:21 +02:00
project.pbxproj Merge branch 'develop' into xcode11 2020-07-01 09:59:29 +03:00