Merge branch 'rebranding' into 15-code-refactoring-constants

# Conflicts:
#	Riot/Assets/Riot-Defaults.plist
This commit is contained in:
SBiOSoftWhare
2020-07-08 17:45:27 +02:00
122 changed files with 515 additions and 528 deletions
+3
View File
@@ -11,6 +11,9 @@
<string>applinks:riot.im</string>
<string>applinks:www.riot.im</string>
<string>webcredentials:riot.im</string>
<string>applinks:element.io</string>
<string>applinks:*.element.io</string>
<string>webcredentials:*.element.io</string>
</array>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>