SchildiChat-android/vector/src/main
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
..
assets QRCode: generate and scan QRCodes 2020-01-22 15:03:56 +01:00
java/im/vector/riotx Merge branch 'develop' into feature/event_deletion_dialog 2020-02-11 12:11:36 +03:00
res Reason input for redacting event is added. 2020-02-10 23:03:37 +03:00
AndroidManifest.xml QRCode: generate and scan QRCodes 2020-01-22 15:03:56 +01:00