Doug 835184f10f Merge remote-tracking branch 'origin/develop' into element_4485 ... # Conflicts: # CHANGES.rst		2021-06-30 12:43:37 +01:00
..
Assets	Merge branch 'origin/develop' into Weblate.	2021-06-30 09:30:49 +00:00
Categories	DesignKit: Update ElementFonts with new Fonts protocol.	2021-06-24 15:49:38 +02:00
Coordinators	Remove SimpleCoordinator	2020-09-23 11:14:14 +03:00
Generated	Add route icons	2021-06-28 02:11:12 +03:00
Managers	Theme: Update DarkTheme and DefaultTheme with fonts property.	2021-06-21 21:12:27 +02:00
Model	Adopt consolidated logging mechanism (#4370)	2021-06-03 11:30:07 +03:00
Modules	Merge remote-tracking branch 'origin/develop' into element_4485	2021-06-30 12:43:37 +01:00
Navigator	Add AppNavigator that enables to perform the navigation within the global app scope.	2021-06-07 18:46:16 +02:00
Routers	Adopt consolidated logging mechanism (#4370)	2021-06-03 11:30:07 +03:00
SupportingFiles	SSOAuthenticationService: Handle login callback URL with HTML entities.	2021-06-28 16:49:05 +02:00
Utils	Merge branch 'spaces_beta' into spaces_feature_unavailable	2021-05-07 15:08:45 +02:00
Common.xcconfig	XcodeGen: Use same names for yml and xcconfig files in every target	2021-02-11 09:21:00 +01:00
Debug.xcconfig	XcodeGen: Use same names for yml and xcconfig files in every target	2021-02-11 09:21:00 +01:00
Release.xcconfig	XcodeGen: Use same names for yml and xcconfig files in every target	2021-02-11 09:21:00 +01:00
target.yml	Merge pull request #4379 from vector-im/manu/more_languages	2021-06-03 10:41:03 +02:00