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

Update webpage #2

Manually merged
oyvindskaaden merged 4 commits from master into production 2020-08-16 15:15:51 +02:00
Conversation 1 Commits 4 Files Changed 1 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4753ad4bdd - Show all commits

3
index.md
View File

@ -1,7 +1,8 @@
--- ---
layout: default layout: default
--- ---
<<<<<<< HEAD Testing
Prosjekter, dokumenter og annet Prosjekter, dokumenter og annet
------------------------------- -------------------------------
* [NTNU prosjekter og filer](./files/ntnu/) * [NTNU prosjekter og filer](./files/ntnu/)