Christophe Beyls e95fb8740e Merge branch 'master' into feature/room_status		2018-01-31 00:51:24 +01:00
..
src/main	Merge branch 'master' into feature/room_status	2018-01-31 00:51:24 +01:00
build.gradle	Update the version code for the next release	2018-01-29 17:50:00 +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