LucasGGamerM 1e6dadd7ab 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/fragments/HomeTabFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

2023-04-27 15:30:58 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main'

2023-04-27 15:30:58 -03:00

.gitignore

Fix volume buttons in photo viewer

2022-02-17 00:58:12 +03:00

build.gradle

Merge remote-tracking branch 'megalodon_main/main'

2023-04-22 13:53:50 -03:00

proguard-rules.pro

build: update proguard rules for better clarity

2023-04-22 16:29:31 -03:00