onurays 190fbb95ec Merge branch 'develop' into feature/target-sdk-29 ...

# Conflicts:
#	vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt

2020-04-14 13:59:54 +03:00

..

src

Merge branch 'develop' into feature/target-sdk-29

2020-04-14 13:59:54 +03:00

.gitignore

first commit

2018-10-03 17:58:12 +02:00

build.gradle

Merge develop into the branch.

2020-03-26 14:39:50 +03:00

lint.xml

Improve lint configuration

2019-04-03 12:04:24 +02:00

proguard-rules.pro

first commit

2018-10-03 17:58:12 +02:00