Christophe Beyls 10c06ac6dc Merge branch 'master' into feature/room_status		2018-01-18 15:47:12 +01:00
..
src/main	Merge branch 'master' into feature/room_status	2018-01-18 15:47:12 +01:00
build.gradle	Use the new "implementation" qualifier for dependencies	2018-01-12 00:09:23 +01:00
proguard-rules.pro	Migrated to AppCompat 24.1.1 and converted most icon resources to vector drawables	2016-10-26 15:44:02 +02:00