Commit Graph

3 Commits

Author SHA1 Message Date
SBiOSoftWhare
f536c8fde1 AvatarViewData: Make mediaManager property optional. 2021-09-29 11:28:13 +02:00
Gil Eluard
9279d17226 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
SBiOSoftWhare
652831fdbd AvatarView: Update AvatarViewDataProtocol, add possibility to set a defaut image. 2021-06-30 23:25:15 +02:00