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
..
ActivitiesModule.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-04-24 16:42:54 +09:00
AppComponent.kt	Cleanup dagger setup (#2300)	2022-01-23 20:24:55 +01:00
AppInjector.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
AppModule.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 02:42:27 +09:00
BroadcastReceiverModule.kt	Push notifications support via UnifiedPush (#2303)	2022-05-17 19:32:09 +02:00
FragmentBuildersModule.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-03-04 17:51:25 +09:00
Injectable.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
NetworkModule.kt	Merge commit '0f1e95d0ca81d0254f8d1ae6b60a3130d51b15cf'	2022-05-19 00:15:17 +09:00
ServicesModule.kt	Rename Toots to Posts (#2396)	2022-03-20 20:21:42 +01:00
ViewModelFactory.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-04-13 00:59:06 +09:00