LucasGGamerM 64e681c227 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	metadata/de-DE/changelogs/83.txt
#	metadata/en-US/changelogs/83.txt

2023-04-12 13:04:31 -03:00

..

attrs.xml

Adding a new fluent edit icon for the fab

2022-12-29 17:13:44 -03:00

colors.xml

Fixing #84

2023-02-08 20:17:28 -03:00

dimens.xml

slightly smaller collapsed height

2023-04-07 18:45:11 +02:00

ids.xml

Still in the need to Frankenstein the add menu

2023-02-20 13:33:04 -03:00

palettes.xml

feat(theme/nord): add favourite and bookmark icon

2022-12-24 13:40:06 +01:00

strings_mo.xml

feat: add link to up-to-date nightly build in settings

2023-04-03 17:09:07 -03:00

strings_sk.xml

Merge remote-tracking branch 'megalodon_main/main'

2023-04-12 13:04:31 -03:00

strings.xml

Merge branch 'fix/header-follow-protected-account'

2023-03-20 18:28:27 +01:00

styles.xml

feat(external-share): use transparent background

2023-03-17 20:38:56 +01: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

Profiles

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