Christian Schabesberger f451f1f65d resolve conflict		2018-01-20 18:06:34 +01:00
..
attrs.xml	resolve conflict	2017-11-16 12:20:03 +01:00
colors.xml	-#836: Modified notifications texts to use custom colors instead of device-specific styles.	2017-11-15 20:42:05 -08:00
dimens.xml	fix layout	2017-11-12 09:16:51 +01:00
ic_launcher_background.xml	Added Adaptive launcher Icon	2017-09-21 22:46:36 -03:00
settings_keys.xml	resolve conflict	2018-01-20 18:06:34 +01:00
strings.xml	resolve conflict	2018-01-20 18:06:34 +01:00
styles.xml	resolve conflict	2017-11-16 12:20:03 +01:00