LucasGGamerM
b294c998ae
Merge branch 'feature/hide_alttext'
# Conflicts:
# mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
# mastodon/src/main/res/values-de-rDE/strings_mo.xml
# mastodon/src/main/res/values/strings_mo.xml