Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_edit.xml
This commit is contained in:
stefan-niedermann 2020-01-10 17:24:09 +01:00
commit fdf46b6274

View file

@ -11,10 +11,9 @@
android:id="@+id/editContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:ems="10"
android:gravity="top"
android:ems="10"
android:inputType="textMultiLine|textCapSentences"
android:padding="16dp"
android:textColor="@color/fg_default" />
android:textColor="@color/fg_default"/>
</ScrollView>