Update Logo

Testing
Merge branch 'master' into production
2020-08-16 17:16:00 +02:00 · 2020-08-16 15:42:04 +02:00 · 2020-08-16 15:41:23 +02:00 · 2020-08-16 15:37:18 +02:00 · 2020-08-16 15:33:51 +02:00 · 2020-08-16 15:22:40 +02:00
4 changed files with 11629 additions and 2 deletions
--- a/_config.yml
+++ b/_config.yml
@ -1,7 +1,7 @@
 title: GLaDOS
 description: Personlig nettside for Øyvind Skaaden
 baseurl: dev
-logo: assets/img/logo.png
+logo: assets/img/gladosLogo.svg
 show_downloads: false
 google_analytics:
 theme: jekyll-theme-minimal
--- a/assets/img/gladosLogo.svg
+++ b/assets/img/gladosLogo.svg
--- a/assets/img/logo.png
+++ b/assets/img/logo.png
--- a/index.md
+++ b/index.md
@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-
+Testing 
 Prosjekter, dokumenter og annet
 -------------------------------
 * [NTNU prosjekter og filer](./files/ntnu/ntnu.md)
@ -13,3 +13,4 @@ Andre tjenester på *GLaDOS*
 	- Nettside for å lage tankekart ut ifra vanlige tekstfiler
 * [Git](https://git.glados.no)
 	- Git-server for større prosjekter
+
Author	SHA1	Message	Date
Øyvind Skaaden	95ffdf7c31	Update Logo	2020-08-16 17:16:00 +02:00
Øyvind Skaaden	7568904bb4	Testing	2020-08-16 15:42:04 +02:00
Øyvind Skaaden	eca3d4ae25	Merge branch 'master' into production	2020-08-16 15:41:23 +02:00
Øyvind Skaaden	3d6bb1f41f	Merge branch 'master' into production	2020-08-16 15:37:18 +02:00
Øyvind Skaaden	b4722d1207	Merge branch 'master' into production Update webpage	2020-08-16 15:33:51 +02:00
Øyvind Skaaden	cb0eab5bc6	Merge branch 'master' into production	2020-08-16 15:22:40 +02:00
Øyvind Skaaden	c478eec4fa	Test merge	2020-08-16 15:15:33 +02:00
Øyvind Skaaden	a03421eb85	Yett	2020-08-16 14:55:09 +02:00