oyvindskaaden
/
glados.no
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: oyvindskaaden:5f6e92976ee4d3a386b243f35122353e7aecfde7
Branches Tags
oyvindskaaden:master
oyvindskaaden:dev
oyvindskaaden:bootstrap5
oyvindskaaden:MetaPost
..
compare: oyvindskaaden:95ffdf7c313c800dd5e9caad57a7bd4921d4f5d4
Branches Tags
oyvindskaaden:master
oyvindskaaden:dev
oyvindskaaden:bootstrap5
oyvindskaaden:MetaPost

8 Commits
5f6e92976e ... 95ffdf7c31

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
4 changed files with 11629 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
_config.yml
View File

@ -1,7 +1,7 @@
title: GLaDOS title: GLaDOS
description: Personlig nettside for Øyvind Skaaden description: Personlig nettside for Øyvind Skaaden
baseurl: dev baseurl: dev
logo: assets/img/logo.png logo: assets/img/gladosLogo.svg
show_downloads: false show_downloads: false
google_analytics: google_analytics:
theme: jekyll-theme-minimal theme: jekyll-theme-minimal

11626
assets/img/gladosLogo.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 869 KiB

BIN
assets/img/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.0 KiB

3
index.md
View File

@ -1,7 +1,7 @@
--- ---
layout: default layout: default
--- ---
Testing
Prosjekter, dokumenter og annet Prosjekter, dokumenter og annet
------------------------------- -------------------------------
* [NTNU prosjekter og filer](./files/ntnu/ntnu.md) * [NTNU prosjekter og filer](./files/ntnu/ntnu.md)
@ -13,3 +13,4 @@ Andre tjenester på *GLaDOS*
- Nettside for å lage tankekart ut ifra vanlige tekstfiler - Nettside for å lage tankekart ut ifra vanlige tekstfiler
* [Git](https://git.glados.no) * [Git](https://git.glados.no)
- Git-server for større prosjekter - Git-server for større prosjekter