Peter Vágner d4be68191c Fix conflicts after rebase ... Signed-off-by: Peter Vágner <pvdeejay@gmail.com>		2019-10-02 20:04:33 +02:00
..
sampledata
signature
src	Fix conflicts after rebase	2019-10-02 20:04:33 +02:00
.gitignore
build.gradle	Fix crash: MergedHeaderItem was missing dimensionConverter	2019-09-24 14:23:13 +02:00
lint.xml
proguard-rules.pro