Benoit Marty d876690fc7 Merge branch 'hotfix/1.4.20' into develop		2022-06-13 14:08:49 +02:00
..
assets	Remove ShortcutBadger lib and usage (it was dead code)	2022-05-18 09:06:04 +02:00
java/im/vector/app	Merge branch 'hotfix/1.4.20' into develop	2022-06-13 14:08:49 +02:00
res	Merge pull request #6247 from vector-im/feature/ons/fix_static_map_copyright_size	2022-06-10 13:56:24 +02:00
AndroidManifest.xml	Rename existing SyncService to SyncAndroidService to avoid confusion	2022-06-08 09:55:28 +02:00