Files
bundesmessenger-ios/Riot/Assets/Images.xcassets
Doug 997ee54f20 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
..
2021-08-03 17:00:13 +03:00
2020-09-11 13:37:49 +03:00
2019-02-15 13:55:36 +00:00
2020-11-30 16:41:08 +01:00
2020-07-11 00:33:35 +02:00
2020-07-10 21:23:33 +02:00
2018-07-10 10:21:21 +02:00
2020-11-30 16:41:08 +01:00
2020-11-30 16:41:08 +01:00
2020-09-30 17:22:04 +02:00
2020-07-11 00:59:11 +02:00
2020-11-26 10:36:29 +01:00