LucasGGamerM 61b20eea05 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Account.java

2023-09-05 07:12:27 -03:00

..

attrs.xml

refactor: change bookmark_selected to colorBookmark

2023-08-28 12:18:25 -03:00

colors.xml

fix: fix incorrect m3_overlay alpha values

2023-09-02 20:06:56 -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

fix: use better colors for true black mode

2023-08-28 15:57:33 -03:00

strings_mo.xml

Merge pull request #252

2023-09-04 07:19:54 -03:00

strings_sk.xml

Merge remote-tracking branch 'megalodon_main/main'

2023-09-05 07:12:27 -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

replace donation link

2023-08-28 22:35:17 +02:00