Vitor Pamplona 0aee4407db Merge remote-tracking branch 'origin/HEAD' into additive_feed_test ...

# Conflicts:
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt

2023-04-19 13:00:45 -04:00

..

src

Merge remote-tracking branch 'origin/HEAD' into additive_feed_test

2023-04-19 13:00:45 -04:00

.gitignore

…

build.gradle

disables errors due to missing translations

2023-04-19 11:33:03 -04:00

proguard-rules.pro

…