Umberto Furno bb4b4a91c8 Resolved merge conflict		2020-01-08 15:39:33 +01:00
..
drawable	Resolved merge conflict	2020-01-08 15:39:33 +01:00
drawable-v24	add app module and refactoring	2019-11-24 18:48:40 +01:00
layout	Resolved merge conflict	2020-01-08 15:39:33 +01:00
mipmap-anydpi-v26	add app module and refactoring	2019-11-24 18:48:40 +01:00
mipmap-hdpi	add app module and refactoring	2019-11-24 18:48:40 +01:00
mipmap-mdpi	add app module and refactoring	2019-11-24 18:48:40 +01:00
mipmap-xhdpi	add app module and refactoring	2019-11-24 18:48:40 +01:00
mipmap-xxhdpi	add app module and refactoring	2019-11-24 18:48:40 +01:00
mipmap-xxxhdpi	add app module and refactoring	2019-11-24 18:48:40 +01:00
values	Resolved merge conflict	2020-01-08 15:39:33 +01:00