Gil Eluard 469f8883c6 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists ...

# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m

2021-08-03 22:07:45 +02:00

..

Images.swift

Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu

2021-07-26 12:03:31 +02:00

InfoPlist.swift

Merge branch 'develop' into element_3816

2021-01-11 12:18:30 +01:00

RiotDefaults.swift

Remove redundant keys manually

2020-08-05 18:58:24 +03:00

Storyboards.swift

Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu

2021-07-26 12:03:31 +02:00

Strings.swift

Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists

2021-08-03 22:07:45 +02:00