LucasGGamerM afc401c1f2 Merge remote-tracking branch 'megalodon_main/main' into m3-merger ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/res/values-pl-rPL/strings_sk.xml # mastodon/src/main/res/values-ru-rRU/strings_sk.xml # metadata/ru/full_description.txt		2023-08-24 08:17:57 -03:00
..
50.txt	Translated using Weblate (Slovenian)	2023-01-27 15:34:51 -03:00
55.txt	Translated using Weblate (Slovenian)	2023-02-12 16:56:42 +00:00
59.txt	Translated using Weblate (Slovenian)	2023-01-27 15:34:51 -03:00
62.txt	Translated using Weblate (Slovenian)	2023-02-12 16:56:42 +00:00
63.txt	Translated using Weblate (Slovenian)	2023-02-11 13:13:09 +00:00
65.txt	Translated using Weblate (Slovenian)	2023-02-12 16:56:42 +00:00
67.txt	Merge remote-tracking branch 'weblate/main'	2023-02-13 17:30:04 +01:00
74.txt	Translated using Weblate (Slovenian)	2023-02-11 13:13:08 +00:00
78.txt	Translated using Weblate (Slovenian)	2023-01-26 19:53:02 -03:00
79.txt	Translated using Weblate (Slovenian)	2023-01-26 19:53:02 -03:00
80.txt	Translated using Weblate (Slovenian)	2023-01-26 19:53:02 -03:00
87.txt	Translated using Weblate (Slovenian)	2023-01-26 19:53:02 -03:00
94.txt	Translated using Weblate (Slovenian)	2023-08-21 22:40:19 +02:00