diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2012-11-16 19:17:13 +0100 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2012-11-16 19:17:13 +0100 |
| commit | a7831abf77a75b15681c3a4364d04950394dddab (patch) | |
| tree | 3c87ebd327ded4441d424b64203ef3b9c234a7f1 /res/values-de | |
| parent | 5c55b0922bbae266163f4c8557d8010753d94a51 (diff) | |
| parent | b154865d60b6474b537437ae40ca99fd63d9562a (diff) | |
| download | AntennaPod-a7831abf77a75b15681c3a4364d04950394dddab.zip | |
Merge branch 'feed-item-labels' of git://github.com/patheticpat/AntennaPod into patheticpat-feed-item-labels
Conflicts:
src/de/danoeh/antennapod/feed/FeedItem.java
Diffstat (limited to 'res/values-de')
0 files changed, 0 insertions, 0 deletions