owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
07d2ad749e6e7a940e079f3a63d6011256678d07
moshidon/mastodon/src/main/java/org
History
LucasGGamerM 07d2ad749e Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
2023-10-12 21:25:16 -03:00
..
joinmastodon/android
Merge remote-tracking branch 'megalodon_main/main'
2023-10-12 21:25:16 -03:00