LucasGGamerM e694715dae Merge branch 'bugfix/965' ...

# Conflicts:
#	mastodon/src/main/AndroidManifest.xml

2024-03-17 16:25:49 -03:00

..

api

Merge branch 'bugfix/965'

2024-03-17 16:25:49 -03:00

events

chore(merge-upstream): more conflict solving tomfoolery

2024-02-16 20:21:38 -03:00

fragments

Merge pull request #358

2024-03-17 13:28:11 -03:00

model

Merge branch 'merge-upstream'

2024-03-16 18:21:22 -03:00

ui

Merge pull request #357

2024-03-17 13:39:25 -03:00

updater

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

utils

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

AudioPlayerService.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

E.java

Tooting of text toots

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

ExitActivity.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

ExternalShareActivity.java

chore: readd all the new bottom sheet code

2024-03-04 16:29:57 -03:00

GlobalUserPreferences.java

feat: readd prereply sheets from upstream back into the code

2024-03-04 21:00:30 -03:00

MainActivity.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

MastodonApp.java

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

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

OAuthActivity.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

PanicResponderActivity.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

PushNotificationReceiver.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

UnifiedPushNotificationReceiver.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00