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

2023-08-28 10:15:18 -03:00

..

attrs.xml

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

2023-08-27 13:51:42 -03:00

colors.xml

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

2023-08-27 13:51:42 -03:00

dimens.xml

Merge remote-tracking branch 'megalodon_main/main'

2023-06-09 18:09:23 -03:00

ids.xml

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

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

mtrl_switch.xml

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

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

nachos_attrs.xml

Hashtag timelines with multiple tags (#584)

2023-06-21 01:38:51 +02:00

nachos_colors.xml

Hashtag timelines with multiple tags (#584)

2023-06-21 01:38:51 +02:00

nachos_dimens.xml

Hashtag timelines with multiple tags (#584)

2023-06-21 01:38:51 +02:00

nachos_strings.xml

Hashtag timelines with multiple tags (#584)

2023-06-21 01:38:51 +02:00

nachos_styles.xml

Hashtag timelines with multiple tags (#584)

2023-06-21 01:38:51 +02:00

palettes.xml

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

2023-08-27 13:51:42 -03:00

strings_mo.xml

Merge branch 'feature/hide_alttext'

2023-08-28 10:15:18 -03:00

strings_sk.xml

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

2023-08-27 13:51:42 -03:00

strings.xml

Fix strings

2023-08-23 00:44:40 +03:00

styles.xml

fix inconsistent coloring on alert dialog items

2023-08-27 20:57:29 -03:00

tablayout_attrs.xml

Profiles

2022-02-07 15:07:12 +03:00

tablayout_dimens.xml

Profiles

2022-02-07 15:07:12 +03:00

tablayout_integers.xml

Profiles

2022-02-07 15:07:12 +03:00

tablayout_styles.xml

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

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

tokens.xml

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

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

urls.xml

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

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