Merge branch 'master' into fork

2022-05-14 13:48:03 +02:00
parent bde2e398a8 68d0862008
commit 39655d5278
18 changed files with 283 additions and 134 deletions
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -352,4 +352,5 @@
 		<item quantity="other">%,d reblogs</item>
 	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
+	<string name="time_now">now</string>
 </resources>