Merge remote-tracking branch 'origin/develop' into feature/fga/better_timeline_scroll
This commit is contained in:
commit
e730ea6df3
16 changed files with 287 additions and 94 deletions
|
|
@ -27,7 +27,6 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
|
|||
import io.element.android.libraries.di.ApplicationContext
|
||||
import io.element.android.libraries.di.SessionScope
|
||||
import io.element.android.libraries.matrix.api.MatrixClient
|
||||
import kotlinx.coroutines.NonCancellable
|
||||
import kotlinx.coroutines.withContext
|
||||
import okhttp3.OkHttpClient
|
||||
import javax.inject.Inject
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue