Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Showing only changes of commit 0092b2e839 - Show all commits

View File

@@ -64,19 +64,5 @@
android:textColor="@color/secondaryColour"
/>
<view
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintTop_toBottomOf="@id/topBar"
android:background="@color/black"
/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintBottom_toTopOf="@id/navbar"
android:background="@color/black"
/>
</androidx.constraintlayout.widget.ConstraintLayout>