Christian Schabesberger 338893ded4 fix merge conflict

2019-01-23 16:12:21 +01:00

..

src

fix merge conflict

2019-01-23 16:12:21 +01:00

.gitignore

…

build.gradle

fix merge conflict

2019-01-23 16:12:21 +01:00

proguard-rules.pro

Downloader: Fix crash on loading unfinished downloads from .giga files

2018-06-01 14:35:03 +02:00