diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2012-11-11 17:45:48 +0100 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2012-11-11 17:45:48 +0100 |
| commit | 7f92cdce70cb6b9d84186a7aa2b4cd58e03b6b69 (patch) | |
| tree | ab84de04edbe526e59fb4635bbcb1e337b26493c /pom.xml | |
| parent | 1210c7a8a4448ba2b0ac017bd7cb16ea4a5704e8 (diff) | |
| parent | 8e7a4025543840b7f984fed1db9b9ea08e03a679 (diff) | |
| download | AntennaPod-7f92cdce70cb6b9d84186a7aa2b4cd58e03b6b69.zip | |
Merge branch 'description_update' into develop
Conflicts:
src/de/danoeh/antennapod/feed/FeedItem.java
Diffstat (limited to 'pom.xml')
0 files changed, 0 insertions, 0 deletions