Benoit Marty 2b6eee4237 Merge branch 'develop' into feature/home_rework		2019-06-04 12:54:16 +02:00
..
sampledata	Public rooms little rework	2019-06-03 16:44:31 +02:00
src	Merge branch 'develop' into feature/home_rework	2019-06-04 12:54:16 +02:00
.gitignore
build.gradle
lint.xml
proguard-rules.pro