LucasGGamerM da5186c7b5 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java # mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java # mastodon/src/main/res/drawable/bg_note_edit.xml # mastodon/src/main/res/layout/fragment_profile.xml # metadata/uk/full_description.txt		2023-11-17 16:02:23 -03:00
..
55.txt	Making changelogs and stuff ready for fdroid release	2022-12-26 20:23:31 -03:00
56.txt	Making changelogs and stuff ready for fdroid release	2022-12-26 20:23:31 -03:00
59.txt	bump version, update changelog	2022-12-12 23:35:54 +01:00
61.txt	bump version	2022-12-17 23:28:56 +01:00
62.txt	Translated using Weblate (German)	2022-12-30 21:54:40 +00:00
63.txt	update changelogs	2022-12-23 23:48:21 +01:00
65.txt	Translated using Weblate (German)	2023-05-21 13:25:16 +00:00
67.txt	Translated using Weblate (German)	2023-01-26 00:31:06 +00:00
68.txt	bump version	2023-01-17 02:20:27 +01:00
73.txt	Translated using Weblate (German)	2023-01-27 15:38:18 -03:00
74.txt	bump version and update strings	2023-01-26 16:48:36 +01:00
76.txt	Translated using Weblate (German)	2023-02-13 16:50:55 +00:00
77.txt	Translated using Weblate (German)	2023-02-17 12:30:41 +00:00
78.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
79.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
80.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
81.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
82.txt	rename version	2023-03-24 20:05:42 +01:00
83.txt	Translated using Weblate (German)	2023-06-12 16:22:10 +00:00
84.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
85.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
86.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
87.txt	Translated using Weblate (German)	2023-01-26 19:53:01 -03:00
88.txt	Translated using Weblate (German)	2023-01-30 19:04:45 +00:00
89.txt	Translated using Weblate (German)	2023-01-30 21:51:46 +00:00
91.txt	Translated using Weblate (German)	2023-02-11 00:00:15 +00:00
92.txt	Translated using Weblate (German)	2023-02-11 00:00:15 +00:00
94.txt	boop version	2023-06-13 10:19:13 +02:00
95.txt	Translated using Weblate (German)	2023-02-23 04:08:20 +00:00
96.txt	Translated using Weblate (German)	2023-02-23 04:08:20 +00:00
97.txt	Translated using Weblate (German)	2023-03-06 23:39:04 +00:00
98.txt	Translated using Weblate (German)	2023-03-06 23:39:04 +00:00
99.txt	Translated using Weblate (German)	2023-04-02 11:39:55 +00:00
101.txt	Translated using Weblate (German)	2023-07-31 17:53:03 +00:00
108.txt	fuck it, production release	2023-10-28 15:09:00 +02:00
110.txt	bump version	2023-11-15 18:48:12 +01:00