Martin Fietz d3491d1858 Merge branch 'develop' into refactor ...

# Conflicts:
#	app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
#	core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java

2018-01-21 11:10:20 +01:00

..

src

Merge branch 'develop' into refactor

2018-01-21 11:10:20 +01:00

.gitignore

Moved core classes into subproject

2014-10-11 17:43:07 +02:00

build.gradle

Replace ViewHelper

2018-01-09 19:59:51 +01:00

proguard-rules.pro

Moved core classes into subproject

2014-10-11 17:43:07 +02:00