Merge branch 'add_label_for_adding_feed' into fix_sharing_opml

This commit is contained in:
Tom Hennen 2015-05-25 21:13:38 -04:00
commit bafdc86ca0
1 changed files with 2 additions and 1 deletions

View File

@ -208,7 +208,8 @@
<activity
android:name=".activity.DefaultOnlineFeedViewActivity"
android:configChanges="orientation">
android:configChanges="orientation"
android:label="@string/add_feed_label">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="de.danoeh.antennapod.activity.MainActivity"/>