Merge branch 'master' into fork

2022-05-05 16:06:28 +02:00
parent 12599db0ff b4219bcaa0
commit 919d5cffb5
87 changed files with 3102 additions and 312 deletions
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -341,4 +341,5 @@
 		<item quantity="one">%,d reblog</item>
 		<item quantity="other">%,d reblogs</item>
 	</plurals>
+	<string name="timestamp_via_app">%1$s via %2$s</string>
 </resources>