Dominik Schürmann efb1868791 Fix merge conflicts

2016-11-30 13:46:50 +01:00

..

src

Fix merge conflicts

2016-11-30 13:46:50 +01:00

.gitignore

…

build.gradle

Fix merge conflicts

2016-11-30 13:46:50 +01:00

proguard-rules.pro

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

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