owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6318745fe735ca0e6e8220600ce3ee9c9505a77e
moshidon/mastodon/src/main/java/org/joinmastodon
History
LucasGGamerM 6318745fe7 Merge remote-tracking branch 'megalodon_main/main' into m3-merger 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java
2023-08-27 13:51:42 -03:00
..
android
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-27 13:51:42 -03:00