Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

This commit is contained in:
Magne Sjaastad
2014-08-06 08:16:30 +02:00
3 changed files with 2 additions and 1 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
CNAME

1
CNAME Normal file
View File

@@ -0,0 +1 @@
resinsight.org

View File

@@ -2,6 +2,5 @@ highlighter: pygments
relative_permalinks: false
permalink: /news/:year/:month/:day/:title/
repository: https://github.com/OPM/ResInsight
baseurl: /ResInsight
markdown: kramdown