mcc fe8ed9f331 Fix merge error		2023-02-10 15:30:12 -05:00
..
schemas/com.keylesspalace.tusky.db.AppDatabase	Dialog notifying user of failure when media upload fails (#3135)	2023-01-27 20:50:45 +01:00
src	Clean up Account adapters (#3202)	2023-02-04 20:29:13 +01:00
build.gradle	Fix merge error	2023-02-10 15:30:12 -05:00
proguard-rules.pro	Keep all subclasses of PreferenceFragmentCompat (#3162)	2023-01-13 19:51:42 +01:00