Thomas 0b6c1d6504 Merge branch 'main' into develop ... # Conflicts: # app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java		2023-09-04 11:07:14 +02:00
..
androidTest/java/app/fedilab/android	Some changes	2023-01-23 09:31:32 +01:00
debug	Some fixes	2023-01-27 18:19:24 +01:00
fdroid	Fix dynamic colors	2023-01-30 18:15:12 +01:00
main	Merge branch 'main' into develop	2023-09-04 11:07:14 +02:00
playstore	Some fixes	2023-01-27 18:19:24 +01:00
test/java/app/fedilab/android	Some changes	2023-01-23 09:31:32 +01:00