Giovanni Harting 96a0bf9ed4 fixed some merge derps

2017-01-31 16:30:22 +01:00

..

src/main

updated deps and code to a more recent state

2017-01-31 16:15:24 +01:00

build.gradle

fixed some merge derps

2017-01-31 16:30:22 +01:00

proguard-rules.txt

Initial commit from non tracked working directory

2015-08-13 03:36:03 +02:00