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

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	metadata/en-US/full_description.txt
#	metadata/ja-JP/title.txt

2023-10-28 10:46:33 -03:00

..

api

Merge remote-tracking branch 'megalodon_main/main'

2023-10-28 10:46:33 -03:00

events

Merge remote-tracking branch 'megalodon_main/main'

2023-10-19 15:01:22 -03:00

fragments

Merge remote-tracking branch 'megalodon_main/main'

2023-10-28 10:46:33 -03:00

model

Merge remote-tracking branch 'megalodon_main/main'

2023-10-25 20:10:41 -03:00

ui

Merge remote-tracking branch 'megalodon_main/main'

2023-10-28 10:46:33 -03:00

updater

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

utils

Merge remote-tracking branch 'megalodon_main/main'

2023-10-12 14:58:23 -03:00

AudioPlayerService.java

don't save bidi-safe string in account

2023-10-19 01:01:53 +02:00

E.java

Tooting of text toots

2022-01-17 21:50:48 +03:00

ExitActivity.java

Panic responder (#512)

2023-05-20 13:20:25 +02:00

ExternalShareActivity.java

per-account color palette preference

2023-10-06 16:13:38 +02:00

GlobalUserPreferences.java

chore: make app compile again

2023-10-18 14:47:21 -03:00

MainActivity.java

Merge remote-tracking branch 'megalodon_main/main'

2023-10-12 14:58:23 -03:00

MastodonApp.java

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

OAuthActivity.java

open browser if login redirects to website

2023-06-07 21:11:20 +02:00

PanicResponderActivity.java

Panic responder (#512)

2023-05-20 13:20:25 +02:00

PushNotificationReceiver.java

Merge remote-tracking branch 'megalodon_main/main'

2023-10-12 21:41:18 -03:00

UnifiedPushNotificationReceiver.java

Fix unifiedpush (#785)

2023-08-29 12:22:12 +02:00