Gil Eluard eee5499145 Merge branch 'develop' into element_4090 ... # Conflicts: # CHANGES.rst		2021-07-06 09:27:28 +02:00
..
Images.swift	Merge branch 'develop' into element_4090	2021-07-06 09:27:28 +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	Key Backup setup: Create the key backup using 4S if it exists	2021-06-16 08:18:23 +02:00
Strings.swift	#4094 - Added toast notifications and maximum recording duration.	2021-06-24 14:02:41 +03:00