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

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/res/layout/display_item_file.xml

2023-05-27 09:31:27 -03:00

..

androidTest

add unit tests for status filter predicate

2023-05-26 17:02:39 +02:00

debug

build: fixing debug build with wrong resources

2023-04-29 16:38:14 -03:00

github/java/org/joinmastodon/android/updater

build: fixing wrong drawables for github release

2023-04-28 16:26:17 -03:00

main

Merge remote-tracking branch 'megalodon_main/main'

2023-05-27 09:31:27 -03:00

nightly

fix: fix nightly auto-updater

2023-05-05 16:43:43 -03:00