diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-10-08 23:43:13 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-10-08 23:43:13 +0200 |
| commit | e58922fad08bedf4bfe86025d836abdeae49a806 (patch) | |
| tree | 1bd8699fdf274fec52700affaeeb4a32382d2ae0 /res/values-az | |
| parent | a482899eef4a0a7ada979ba0c87b19e91c2f49f1 (diff) | |
| parent | cdd9a0dfdeef8d319063f844fce1e1722f7d9529 (diff) | |
| download | AntennaPod-e58922fad08bedf4bfe86025d836abdeae49a806.zip | |
Merge branch 'feed_preferences' into develop
Conflicts:
res/values/strings.xml
src/de/danoeh/antennapod/storage/DBTasks.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
Diffstat (limited to 'res/values-az')
0 files changed, 0 insertions, 0 deletions