Johannes Mockenhaupt e6eee42081 Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: recategorize cp icons removed unnecessary text colour and fixed indentation layout indentation Moving some buttons to the right categories removed empty ghost files remove duplicate IDs and indentation fix Picture renaming (#311)		2017-07-24 02:25:28 +02:00
..
libs	Add prefernces.json validator lib	2017-01-29 13:00:21 +01:00
src	Merge remote-tracking branch 'origin/dev' into combo	2017-07-24 02:25:28 +02:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Merge remote-tracking branch 'origin/dev' into combo	2017-07-21 17:42:27 +02: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