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
signature
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
proguard-rules.pro