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
..
2022-12-12 23:35:54 +01:00
2022-12-17 23:28:56 +01:00
2022-12-22 00:14:59 +01:00
2022-12-23 23:48:21 +01:00
2023-01-17 00:57:46 +00:00
2023-01-17 00:57:46 +00:00
2023-01-27 15:38:18 -03:00
2023-01-26 16:48:36 +01:00
2023-02-13 17:58:27 +01:00
2023-02-17 13:27:41 +01:00
2022-12-26 20:23:31 -03:00
2022-12-27 20:41:22 -03:00
2022-12-28 20:33:19 -03:00
2022-12-29 14:08:19 -03:00
2023-03-24 20:05:42 +01:00
2023-03-24 20:05:42 +01:00
2023-01-02 13:47:42 -03:00
2023-01-05 13:44:24 -03:00
2023-01-11 11:28:29 -03:00
2023-01-21 16:11:14 -03:00
2023-01-27 21:43:51 -03:00
2023-01-30 16:03:44 -03:00
2023-02-01 22:02:29 -03:00
2023-02-02 16:08:56 -03:00
2023-02-07 20:03:23 -03:00
2023-02-10 21:08:38 -03:00
2023-06-13 10:19:13 +02:00
2023-02-20 14:08:32 -03:00
2023-02-20 17:21:20 -03:00
2023-02-25 15:48:22 -03:00
2023-02-27 20:36:32 -03:00
2023-03-07 15:20:40 -03:00
2023-06-16 13:16:16 -03:00
2023-10-04 10:08:30 -03:00
2023-11-15 18:48:12 +01:00