da5186c7b5
# 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 |
||
---|---|---|
.. | ||
55.txt | ||
56.txt | ||
59.txt | ||
61.txt | ||
62.txt | ||
63.txt | ||
65.txt | ||
67.txt | ||
68.txt | ||
73.txt | ||
74.txt | ||
76.txt | ||
77.txt | ||
78.txt | ||
79.txt | ||
80.txt | ||
81.txt | ||
82.txt | ||
83.txt | ||
84.txt | ||
85.txt | ||
86.txt | ||
87.txt | ||
88.txt | ||
89.txt | ||
91.txt | ||
92.txt | ||
94.txt | ||
95.txt | ||
96.txt | ||
97.txt | ||
98.txt | ||
99.txt | ||
101.txt | ||
108.txt | ||
110.txt |