moshidon

Files

LucasGGamerM d3f2049c7d Merge remote-tracking branch 'mastodon/master'

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/res/layout/display_item_gifv.xml
#	mastodon/src/main/res/layout/display_item_photo.xml
#	mastodon/src/main/res/layout/display_item_video.xml

2023-03-09 15:14:14 -03:00

ElevationOnScrollListener.java

Merge remote-tracking branch 'upstream/master'

2023-01-31 00:00:56 +01:00

MastodonLanguage.java

fix crashes

2023-01-30 23:46:32 +01:00

StatusFilterPredicate.java

Display filtered posts with a warning (#406 )

2023-02-03 18:33:15 +01:00

StatusTextEncoder.java

fix crash