viktoria 678fbedcbf Merge branch 'dev' ... Conflicts: app/src/main/res/values/strings.xml		2017-01-18 03:03:58 +01:00
..
src	Merge branch 'dev'	2017-01-18 03:03:58 +01:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	version bump 1.1	2017-01-07 23:39:29 +01:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00