Merge branch 'master' into media_detail_enhance

This commit is contained in:
Mikel 2017-08-02 21:24:47 +01:00
commit a025cc97d5
213 changed files with 1422 additions and 1101 deletions

View file

@ -148,7 +148,6 @@
android:layout_height="wrap_content"
android:layout_gravity="start"
android:background="?attr/subBackground"
android:foreground="?attr/selectableItemBackground"
android:text="@string/media_detail_license"
android:textColor="@android:color/white"
android:textSize="14sp"