LucasGGamerM c6ded3d505 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/Filter.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java # mastodon/src/main/res/layout/display_item_file.xml		2023-05-27 09:31:27 -03:00
..
src	Merge remote-tracking branch 'megalodon_main/main'	2023-05-27 09:31:27 -03:00
.gitignore	…
build.gradle	bump version	2023-05-26 02:37:32 +02:00
proguard-rules.pro	build: update proguard rules for better clarity	2023-04-22 16:29:31 -03:00