Olivér Falvai 2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup ... # Conflicts: # build.gradle # dependencies.gradle		2022-05-18 11:47:21 +02:00
..
sampledata
signature
src	Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci	2022-05-18 09:51:17 +01:00
.gitignore
build.gradle	Merge remote-tracking branch 'origin/develop' into dependency-cleanup	2022-05-18 11:47:21 +02:00
lint.xml	Small improvement on lint.xml file	2022-05-16 12:23:10 +02:00
proguard-rules.pro