Merge branch '6.4.4_fix_wish'
# Conflicts: # config.gradle
This commit is contained in:
@@ -372,7 +372,7 @@
|
||||
android:src="@mipmap/live_icon_wishlist" />
|
||||
|
||||
<ViewFlipper
|
||||
android:id="@+id/wish_list"
|
||||
android:id="@+id/wish_list_vf"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="20dp"
|
||||
android:layout_marginStart="6dp"
|
||||
|
||||
Reference in New Issue
Block a user