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
..
src	Merge branch 'main' into develop	2023-09-04 11:07:14 +02:00
.gitignore	first commit	2022-04-27 15:20:42 +02:00
build.gradle	Release 3.24.1	2023-08-26 18:18:45 +02:00
proguard-rules.pro	first commit	2022-04-27 15:20:42 +02:00