 Frank Rotermund
|
f9409804b1
|
Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
# Conflicts:
# Config/AppVersion.xcconfig
# Config/BuildSettings.swift
# DesignKit/Source/ColorsSwiftUI.swift
# DesignKit/Source/FontsSwiftUI.swift
# DesignKit/Source/ThemeV2.swift
# DesignKit/Variants/Colors/Dark/DarkColors.swift
# DesignKit/Variants/Colors/Light/LightColors.swift
# Podfile.lock
# Riot/Assets/de.lproj/InfoPlist.strings
# Riot/Assets/de.lproj/Vector.strings
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Images.swift
# Riot/Generated/Strings.swift
# Riot/Managers/PushNotification/PushNotificationService.m
# Riot/Managers/Settings/RiotSettings.swift
# Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/Communities/Home/GroupHomeViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/SetPinCode/PinCodePreferences.swift
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Modules/TabBar/MasterTabBarController.h
# Riot/Modules/TabBar/MasterTabBarController.m
# Riot/Modules/TabBar/TabBarCoordinator.swift
# fastlane/Fastfile
# project.yml
|
2022-09-19 14:42:25 +02:00 |
|
Gil Eluard