onurays afbd9cff70 Merge branch 'develop' into feature/event_deletion_dialog ... # Conflicts: # CHANGES.md # vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt		2020-02-11 12:11:36 +03:00
..
sampledata
signature
src	Merge branch 'develop' into feature/event_deletion_dialog	2020-02-11 12:11:36 +03:00
.gitignore
build.gradle	Version++	2020-02-10 21:41:59 +01:00
lint.xml
proguard-rules.pro