Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/res/mipmap-hdpi/ic_launcher.png # app/src/main/res/mipmap-mdpi/ic_launcher.png # app/src/main/res/mipmap-xhdpi/ic_launcher.png # app/src/main/res/mipmap-xxhdpi/ic_launcher.png # app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
K0bin · Jul 1, 2018 · 36ceaf3 · 36ceaf3
2 parents cc05d8c + f31c562
commit 36ceaf3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/Logo/horizontal.png b/Logo/horizontal.png
diff --git a/Logo/logomark.png b/Logo/logomark.png
diff --git a/Logo/vertical.png b/Logo/vertical.png
diff --git a/README.md b/README.md
@@ -1,4 +1,9 @@
 # Notes
+
+<h1 align=center>
+<img src="Logo/horizontal.png" width=50%>
+</h1>
+
 Tiny simplistic notes app for Android
 
-This is intended as a project for "Programmieren interaktiver Systeme", so I can't use Kotlin. :(
+This is intended as a project for "Programmieren interaktiver Systeme", so I can't use Kotlin. :(