Merge branch 'master' into 'blog'

# Conflicts:
#   src/_includes/header.html
This commit is contained in:
czmj
2017-09-23 19:45:35 +00:00
5 changed files with 336 additions and 9 deletions

View File

@ -1,9 +1,4 @@
<!DOCTYPE HTML>
<!--
Spectral by HTML5 UP
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
{% include head.html %}