Subbramanian Lakshmanan e20cb00877 Fixes the merge conflicts 7 rokov pred
..
src e20cb00877 Fixes the merge conflicts 7 rokov pred
.gitignore 019b70c901 First commit 7 rokov pred
build.gradle e20cb00877 Fixes the merge conflicts 7 rokov pred
proguard-rules.pro ac41e1251a Changed ui a bit. Added theming 7 rokov pred