AntennaPod/app
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
build.gradle Remove multidex again 2017-10-22 11:59:15 +02:00
lint.xml
proguard.cfg Remove multidex again 2017-10-22 11:59:15 +02:00