kyori19 25bee533f1 Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/MainActivity.kt # app/src/main/java/com/keylesspalace/tusky/entity/Account.kt # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml		2022-05-19 02:42:27 +09:00
..
AccountPreferencesFragment.kt	Push notifications support via UnifiedPush (#2303)	2022-05-17 19:32:09 +02:00
NotificationPreferencesFragment.kt	Add support for post edit notifications (#2431)	2022-04-19 11:10:13 +02:00
PreferencesActivity.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-04-13 00:59:06 +09:00
PreferencesFragment.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-01 19:54:22 +09:00
ProxyPreferencesFragment.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
TabFilterPreferencesFragment.kt	convert EmojiPreference and EmojiCompatFont to Kotlin (#1922)	2020-09-02 12:27:51 +02:00