owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
74db111a4fbffae2b70137c128821c70a45ab5bd
moshidon/mastodon/src/main/java/org
History
LucasGGamerM 74db111a4f Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
2023-08-31 14:36:59 -03:00
..
joinmastodon/android
Merge remote-tracking branch 'megalodon_main/main'
2023-08-31 14:36:59 -03:00