Grishka 3b399d5815 Merge branch 'l10n_master' ... # Conflicts: # mastodon/src/main/res/values-ar-rSA/strings.xml # mastodon/src/main/res/values-be-rBY/strings.xml # mastodon/src/main/res/values-bn-rBD/strings.xml # mastodon/src/main/res/values-bs-rBA/strings.xml # mastodon/src/main/res/values-ca-rES/strings.xml # mastodon/src/main/res/values-cs-rCZ/strings.xml # mastodon/src/main/res/values-da-rDK/strings.xml # mastodon/src/main/res/values-de-rDE/strings.xml # mastodon/src/main/res/values-el-rGR/strings.xml # mastodon/src/main/res/values-es-rES/strings.xml # mastodon/src/main/res/values-eu-rES/strings.xml # mastodon/src/main/res/values-fa-rIR/strings.xml # mastodon/src/main/res/values-fil-rPH/strings.xml # mastodon/src/main/res/values-fr-rFR/strings.xml # mastodon/src/main/res/values-gd-rGB/strings.xml # mastodon/src/main/res/values-gl-rES/strings.xml # mastodon/src/main/res/values-hr-rHR/strings.xml # mastodon/src/main/res/values-hu-rHU/strings.xml # mastodon/src/main/res/values-hy-rAM/strings.xml # mastodon/src/main/res/values-in-rID/strings.xml # mastodon/src/main/res/values-is-rIS/strings.xml # mastodon/src/main/res/values-it-rIT/strings.xml # mastodon/src/main/res/values-iw-rIL/strings.xml # mastodon/src/main/res/values-ja-rJP/strings.xml # mastodon/src/main/res/values-kab/strings.xml # mastodon/src/main/res/values-ko-rKR/strings.xml # mastodon/src/main/res/values-my-rMM/strings.xml # mastodon/src/main/res/values-nl-rNL/strings.xml # mastodon/src/main/res/values-no-rNO/strings.xml # mastodon/src/main/res/values-oc-rFR/strings.xml # mastodon/src/main/res/values-pl-rPL/strings.xml # mastodon/src/main/res/values-pt-rBR/strings.xml # mastodon/src/main/res/values-pt-rPT/strings.xml # mastodon/src/main/res/values-ro-rRO/strings.xml # mastodon/src/main/res/values-ru-rRU/strings.xml # mastodon/src/main/res/values-si-rLK/strings.xml # mastodon/src/main/res/values-sl-rSI/strings.xml # mastodon/src/main/res/values-sv-rSE/strings.xml # mastodon/src/main/res/values-th-rTH/strings.xml # mastodon/src/main/res/values-tr-rTR/strings.xml # mastodon/src/main/res/values-uk-rUA/strings.xml # mastodon/src/main/res/values-vi-rVN/strings.xml # mastodon/src/main/res/values-zh-rCN/strings.xml # mastodon/src/main/res/values-zh-rTW/strings.xml		2023-06-30 20:37:37 +03:00
..
src	Merge branch 'l10n_master'	2023-06-30 20:37:37 +03:00
.gitignore	Fix volume buttons in photo viewer	2022-02-17 00:58:12 +03:00
build.gradle	Bump version	2023-06-30 20:35:42 +03:00
proguard-rules.pro	Fix crash in ComposeFragment::onSaveInstanceState in release builds	2022-12-15 20:02:26 +03:00