LucasGGamerM 794e1777f1 Merge remote-tracking branch 'weblate/master' into m3-merger ...

# Conflicts:
#	mastodon/src/main/res/values-de-rDE/strings_sk.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values-sl-rSI/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	metadata/fa-IR/short_description.txt
#	metadata/fa-IR/title.txt
#	metadata/ro/title.txt
#	metadata/uk/changelogs/94.txt

2023-08-27 13:55:03 -03:00

..

src

Merge remote-tracking branch 'weblate/master' into m3-merger

2023-08-27 13:55:03 -03:00

.editorconfig

Merge upstream redesign (#714)

2023-07-16 18:01:42 +02:00

.gitignore

Fix volume buttons in photo viewer

2022-02-17 00:58:12 +03:00

build.gradle

boop versinom

2023-08-24 12:12:55 +02:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

2023-06-15 14:58:12 -03:00