ericdecanini ce8939a092 Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet ... # Conflicts: # vector/src/main/res/values/strings.xml		2022-08-17 21:13:39 +02:00
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
signature	Setup nightly buildType	2022-07-05 16:07:12 +02:00
src	Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet	2022-08-17 21:13:39 +02:00
.gitignore
build.gradle	Bump lazythreetenbp from 0.10.0 to 0.11.0	2022-08-16 23:11:40 +00:00
lint.xml	Ignore PluralsCandidate, I do not know why it is reported by Danger, since this is a warning. Also make this issue an error.	2022-07-29 10:02:40 +02:00
proguard-rules.pro