anoy 3ac4899b96 Merge branch 'dev' into patch-1		2019-01-28 21:19:21 +01:00
..
src	Merge branch 'dev' into patch-1	2019-01-28 21:19: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