LucasGGamerM d0c5a2ed2e Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/res/layout/display_item_poll_option.xml
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values/strings_sk.xml

2023-09-30 14:11:39 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main'

2023-09-30 14:11:39 -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

build: fix oopsie where I forgot to increase the version code as well

2023-09-29 16:57:43 -03:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

2023-06-15 14:58:12 -03:00