Merge branch 'master' into categorization-recycler-view

This commit is contained in:
Paul Hawke 2017-07-25 21:19:21 -05:00
commit bf59afcc3b
31 changed files with 220 additions and 371 deletions

View file

@ -56,4 +56,14 @@
android:gravity="center"
android:layout_marginTop="16dp"
/>
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/media_upload_policy"
android:text="@string/media_upload_policy"
android:gravity="start"
android:layout_marginTop="16dp"
/>
</LinearLayout>