LucasGGamerM 1ba30a4d28 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/res/values-ar/strings_sk.xml # mastodon/src/main/res/values-fr-rFR/strings_sk.xml # mastodon/src/main/res/values-ja-rJP/strings_sk.xml # metadata/ar/short_description.txt		2023-09-11 16:47:24 -03:00
..
src	Merge remote-tracking branch 'megalodon_main/main'	2023-09-11 16:47:24 -03:00
.editorconfig	Merge upstream redesign (#714)	2023-07-16 18:01:42 +02:00
.gitignore	Fix volume buttons in photo viewer	2022-02-17 00:58:12 +03:00
build.gradle	boop verison	2023-09-08 22:19:41 +02:00
proguard-rules.pro	Merge remote-tracking branch 'megalodon_weblate/main'	2023-06-15 14:58:12 -03:00