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