diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-04-05 16:45:03 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-04-05 16:45:03 -0400 |
| commit | 7888ce9aae3ff830716f3cae19a9d33fc3d65aa7 (patch) | |
| tree | b69725c47780b23970f05268e27ec2e3a7bc8fc0 /app/src/main/java/de/danoeh | |
| parent | a8d434a803d8b5dc7d4bc51c50a0a6a2627c456c (diff) | |
| parent | f8ffc2a146869db3c64bd289937c91003be90d4b (diff) | |
| download | AntennaPod-7888ce9aae3ff830716f3cae19a9d33fc3d65aa7.zip | |
Merge pull request #716 from TomHennen/merge_master_changes
Merge master changes. There were some conflicts from master/develop that needed to be fixed. I believe this resolves them.
Diffstat (limited to 'app/src/main/java/de/danoeh')
0 files changed, 0 insertions, 0 deletions