Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-02-01 11:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
AntennaPod/src
History
daniel oeh e58922fad0 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
2013-10-08 23:43:13 +02:00
..
de/danoeh/antennapod
Merge branch 'feed_preferences' into develop
2013-10-08 23:43:13 +02:00
instrumentationTest/de/test/antennapod
Added tests for DBReader
2013-10-08 17:39:08 +02:00