LucasGGamerM 828d07d6b5 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java # metadata/uk/changelogs/56.txt		2023-10-25 20:10:41 -03:00
..
src	Merge remote-tracking branch 'megalodon_main/main'	2023-10-25 20:10:41 -03:00
.editorconfig	…
.gitignore	…
build.gradle	bump version	2023-10-20 13:33:02 +02:00
proguard-rules.pro	…