Merge remote-tracking branch 'origin/feature/attachement_pager' into feature/attachement_pager

This commit is contained in:
Valere 2020-07-10 14:39:22 +02:00
commit ea771476cc
1 changed files with 1 additions and 1 deletions

View File

@ -23,8 +23,8 @@ import androidx.core.util.Pair
import androidx.fragment.app.Fragment
import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
import im.vector.matrix.android.api.session.terms.TermsService
import im.vector.matrix.android.api.util.MatrixItem
import im.vector.matrix.android.api.session.widgets.model.Widget
import im.vector.matrix.android.api.util.MatrixItem
import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes
import im.vector.riotx.features.media.AttachmentData
import im.vector.riotx.features.settings.VectorSettingsActivity