Dominik Schürmann 0dbe067ade Resolve merge conflicts

2016-10-27 19:03:37 +02:00

..

src

Resolve merge conflicts

2016-10-27 19:03:37 +02:00

.gitignore

…

build.gradle

Resolve merge conflicts

2016-10-27 19:03:37 +02:00

proguard-rules.pro

Update libraries, add proguard filters to be under 64K limit

2016-04-29 17:03:50 +02:00