tom79 c9c89dada0 Merge branch 'k-a-s-u-n/mastalab-working' into develop ... # Conflicts: # app/src/main/res/values/strings.xml		2019-04-25 18:52:52 +02:00
..
colors.xml	Last fixes	2019-02-13 18:36:29 +01:00
dimens.xml	small fixes for activity icons	2019-03-31 00:44:34 +05:30
drawables.xml	initial commit	2017-05-05 16:36:04 +02:00
strings.xml	Merge branch 'k-a-s-u-n/mastalab-working' into develop	2019-04-25 18:52:52 +02:00
styles.xml	cleanup	2019-03-29 15:25:59 +08:00